changeset 5567 | 56e9f7b2d8fa |
parent 5229 | dee573ba79f1 |
child 8167 | 6c82beaaa11a |
--- a/tests/test-rename-dir-merge Fri Nov 30 18:23:18 2007 +0100 +++ b/tests/test-rename-dir-merge Sat Dec 01 12:54:34 2007 -0600 @@ -7,9 +7,7 @@ mkdir a echo foo > a/a echo bar > a/b - -hg add a -hg ci -m "0" -d "0 0" +hg ci -Am "0" -d "0 0" hg co -C 0 hg mv a b @@ -17,6 +15,7 @@ hg co -C 0 echo baz > a/c +echo quux > a/d hg add a/c hg ci -m "2 add a/c" -d "0 0"