tests/test-conflict.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 21 Jun 2009 23:04:02 +0200
changeset 8884 8b603c7c808e
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
convert/svn: remove dead code from entry deletion code path It was made obsolete when multi-branches commit were split into multiple Mercurial commits.

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