changeset 749 | 7e4843b7efd2 |
parent 591 | eb46971fc57f |
child 800 | ec85f9e6f3b1 |
child 808 | 8f5637f0a0c0 |
child 814 | 0902ffece4b4 |
--- a/tests/test-conflict +++ b/tests/test-conflict @@ -4,12 +4,12 @@ set -x hg init echo "nothing" > a hg add a -hg commit -t ancestor -u test -d "0 0" +hg commit -m ancestor -d "0 0" echo "something" > a -hg commit -t branch1 -u test -d "0 0" +hg commit -m branch1 -d "0 0" hg co 0 echo "something else" > a -hg commit -t branch2 -u test -d "0 0" +hg commit -m branch2 -d "0 0" export HGMERGE=merge hg up -m 1 hg id