changeset 1933 | 7544700fd931 |
parent 1925 | c71420b186b0 |
child 2283 | e506c14382fd |
--- a/tests/test-conflict +++ b/tests/test-conflict @@ -3,12 +3,12 @@ hg init echo "nothing" > a hg add a -hg commit -m ancestor -d "0 0" +hg commit -m ancestor -d "1000000 0" echo "something" > a -hg commit -m branch1 -d "0 0" +hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a -hg commit -m branch2 -d "0 0" +hg commit -m branch2 -d "1000000 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id