changeset 1933 | 7544700fd931 |
parent 1449 | 30146be3437c |
child 2214 | 6c6c0e5595a2 |
--- a/tests/test-confused-revert +++ b/tests/test-confused-revert @@ -3,7 +3,7 @@ hg init echo foo > a hg add a -hg commit -m "1" -d "0 0" +hg commit -m "1" -d "1000000 0" echo bar > b hg add b @@ -22,11 +22,11 @@ rm b hg co -C 0 echo foo-a > a -hg commit -m "2a" -d "0 0" +hg commit -m "2a" -d "1000000 0" hg co -C 0 echo foo-b > a -hg commit -m "2b" -d "0 0" +hg commit -m "2b" -d "1000000 0" HGMERGE=true hg update -m 1