changeset 749 | 7e4843b7efd2 |
parent 748 | c5df1a9c5276 |
child 801 | 1f9ec150a476 |
child 808 | 8f5637f0a0c0 |
child 814 | 0902ffece4b4 |
--- a/tests/test-conflict.out +++ b/tests/test-conflict.out @@ -1,12 +1,12 @@ + hg init + echo nothing + hg add a -+ hg commit -t ancestor -u test -d '0 0' ++ hg commit -m ancestor -d '0 0' + echo something -+ hg commit -t branch1 -u test -d '0 0' ++ hg commit -m branch1 -d '0 0' + hg co 0 + echo 'something else' -+ hg commit -t branch2 -u test -d '0 0' ++ hg commit -m branch2 -d '0 0' + export HGMERGE=merge + HGMERGE=merge + hg up -m 1