tests/test-conflict.out
author Martin Geisler <mg@lazybytes.net>
Sun, 17 May 2009 16:25:48 +0200
changeset 8517 110763cc3ab0
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
templater: lowercase error message Changing this messages should be safe: automated scripts ought to have debugged their templates and wont grep for this error message.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig