| commit | c087c26520643e122e96f484a3b386136d7560ab | [log] [tgz] |
|---|---|---|
| author | Hyrum Kurt Wright <hwright@apache.org> | Mon Feb 21 20:40:44 2011 +0000 |
| committer | Hyrum Kurt Wright <hwright@apache.org> | Mon Feb 21 20:40:44 2011 +0000 |
| tree | 2819ff1ca4ede1ecc9168209ee83bcb1a8c33af9 | |
| parent | 53035eabbc42d246fb06e6830c9cefd7c9c02ae4 [diff] | |
| parent | 8ecca2f2ca23bc439e2cb2d8139dd9c7abc818b3 [diff] |
On the ignore-mergeinfo-log branch: Bring up-to-date with trunk, resolving conflicts. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo-log@1073138 13f79535-47bb-0310-9956-ffa450edef68