| commit | a2cc8ee90029b961da877c54f10406daacab7e0c | [log] [tgz] |
|---|---|---|
| author | Karl Fogel <kfogel@apache.org> | Mon Jan 15 04:11:31 2007 +0000 |
| committer | Karl Fogel <kfogel@apache.org> | Mon Jan 15 04:11:31 2007 +0000 |
| tree | 06cbc87883ba3cbd7f6c1f97ca6bec81d78e1a76 | |
| parent | 61277928326918ae662408d2faea5909f4eb2b15 [diff] |
Resolve conflicts from merge, as promised in r23009. Branch builds again. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/incomplete-directories@863084 13f79535-47bb-0310-9956-ffa450edef68