Mercurial > hg

view tests/test-conflict.out @ 10948:61cd6653f846 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diffstat: use ui.plain() instead of ui.interactive() Previously, a default width of 80 is used for non-interactive sessions. This behaviour was introduced before HGPLAIN was supported.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Thu, 15 Apr 2010 18:52:59 +0200
parents b2310903c462
children
line wrap: on
line source

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