changeset 925 | 5a034646e472 |
parent 814 | 0902ffece4b4 |
child 1933 | 7544700fd931 |
--- a/tests/test-conflict.out +++ b/tests/test-conflict.out @@ -1,17 +1,8 @@ -+ hg init -+ hg add a -+ hg commit -m ancestor -d 0 0 -+ hg commit -m branch1 -d 0 0 -+ hg co 0 -+ hg commit -m branch2 -d 0 0 -+ hg up -m 1 merge: warning: conflicts during merge merging a merging a failed! -+ hg id 32e80765d7fe+75234512624c+ tip something else ======= something -+ hg status M a