changeset 800 | ec85f9e6f3b1 |
parent 749 | 7e4843b7efd2 |
child 808 | 8f5637f0a0c0 |
--- a/tests/test-conflict Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-conflict Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -set -x hg init echo "nothing" > a hg add a @@ -10,7 +9,7 @@ hg co 0 echo "something else" > a hg commit -m branch2 -d "0 0" -export HGMERGE=merge +HGMERGE=merge; export HGMERGE hg up -m 1 hg id grep -Ev ">>>|<<<" a