tests/test-conflict.out
author Yuya Nishihara <yuya@tcha.org>
Sun, 16 May 2010 22:23:14 +0900
changeset 11183 b25464e9b448
parent 9468 b2310903c462
permissions -rw-r--r--
patchbomb: respect HGPLAIN when piping --test output to PAGER It makes easy to use `hg email --test` from another tool.

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 update -C' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig