Merge in revision 18673. Summary of change:1.3.x-svnmerge.py1.3.x-svnmerge.py
commit27403313cd9b37d3d38a3190b2608efedebb6b35
authorBlair Zajac <[email protected]>
Thu, 2 Mar 2006 03:26:22 +0000 (2 03:26 +0000)
committerBlair Zajac <[email protected]>
Thu, 2 Mar 2006 03:26:22 +0000 (2 03:26 +0000)
treea5f16710d51c4274c48722c7f54c67a9b1d1a111
parentb1390106a1e503587d5a1e5f7eedaa2c80c7f41e
Merge in revision 18673.  Summary of change:

- Have svnmerge_test.py work with svn 1.2.x.

* contrib/client-side/svnmerge_test.py:
  Merged in revision 18673 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.3.x-svnmerge.py@858748 13f79535-47bb-0310-9956-ffa450edef68
contrib/client-side/svnmerge_test.py