changeset 5229 | dee573ba79f1 |
parent 3748 | 7b88bd88f040 |
child 5567 | 56e9f7b2d8fa |
--- a/tests/test-rename-dir-merge Mon Aug 27 14:21:04 2007 -0300 +++ b/tests/test-rename-dir-merge Mon Aug 27 14:21:04 2007 -0300 @@ -24,9 +24,11 @@ echo a/* b/* hg st -C hg ci -m "3 merge 2+1" -d "0 0" +hg debugrename b/c hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0" +hg debugrename b/c