changeset 12156 | 4c94b6d0fb1c |
parent 2982 | 890e285c52a1 |
--- a/tests/test-confused-revert Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-confused-revert Thu Sep 02 23:22:51 2010 +0200 @@ -3,7 +3,7 @@ hg init echo foo > a hg add a -hg commit -m "1" -d "1000000 0" +hg commit -m "1" echo bar > b hg add b @@ -22,11 +22,11 @@ hg co -C 0 echo foo-a > a -hg commit -m "2a" -d "1000000 0" +hg commit -m "2a" hg co -C 0 echo foo-b > a -hg commit -m "2b" -d "1000000 0" +hg commit -m "2b" HGMERGE=true hg merge 1