| commit | 2e1ec4087ab6b8a2d315832ed9b2cd0de504e020 | |
| author | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Mon, 3 Mar 2008 19:38:30 +0000 (3 19:38 +0000) | ||
| committer | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Mon, 3 Mar 2008 19:38:30 +0000 (3 19:38 +0000) | ||
| tree | 16911d0d93f3d75c03c827162790f84a8f408b17 | treesnapshot (tar.gz zip) |
| parent | d39ada75f961a47db5991c191f032bbd495de8f8 | commitdiff |
Rename basic_reintegrate to reintegrate_with_rename, since in fact
it's not as basic as it looks.
* subversion/tests/cmdline/merge_tests.py
(reintegrate_with_rename): Rename from basic_reintegrate.
(test_list): Adjust.
git-svn-id: http://svn.collab.net/repos/svn/trunk@29679 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
it's not as basic as it looks.
* subversion/tests/cmdline/merge_tests.py
(reintegrate_with_rename): Rename from basic_reintegrate.
(test_list): Adjust.
git-svn-id: http://svn.collab.net/repos/svn/trunk@29679 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
| subversion/tests/cmdline/merge_tests.py | diffblobblamehistory |