| commit | 22c6a828ad5fa4584f5054bef56bfc7c3c6ff299 | |
| author | Julian Foad <julian.foad@wandisco.com> | |
| Mon, 15 Sep 2008 17:33:44 +0000 (15 17:33 +0000) | ||
| committer | Julian Foad <julian.foad@wandisco.com> | |
| Mon, 15 Sep 2008 17:33:44 +0000 (15 17:33 +0000) | ||
| tree | 265acfb6b8ddd2a07b18293f82d1e94829ae33c9 | treesnapshot (tar.gz zip) |
| parent | 0103ac6dc6ef5af568f9fb349a8985bd7d4cae35 | commitdiff |
Merge the tree-conflicts branch back to trunk. This implements basic tree
conflict detection for most cases.
See this email thread: <http://svn.haxx.se/dev/archive-2008-09/0504.shtml>.
git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@873156 13f79535-47bb-0310-9956-ffa450edef68
conflict detection for most cases.
See this email thread: <http://svn.haxx.se/dev/archive-2008-09/0504.shtml>.
git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@873156 13f79535-47bb-0310-9956-ffa450edef68
| svntest/actions.py | diffblobblamehistory |