| commit | 88964024265d24edd6df6c815b0dcd901f55606f | [log] [tgz] |
|---|---|---|
| author | Stephen O'Neil Butler <sbutler@apache.org> | Tue Oct 28 15:01:50 2008 +0000 |
| committer | Stephen O'Neil Butler <sbutler@apache.org> | Tue Oct 28 15:01:50 2008 +0000 |
| tree | e830d0c6237baf327f5305ebba90f798e771828e | |
| parent | dbeb950653ff44209a466aa7f18126208da11d8e [diff] | |
| parent | b5fdf253473b20ec126aaa3554a9310c823332ad [diff] |
On the tree-conflicts-notify branch: Merge all changes from trunk up to r33932. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/tree-conflicts-notify@874008 13f79535-47bb-0310-9956-ffa450edef68