Mercurial > hg

view tests/test-conflict.out @ 9637:64425c5a9257

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: minor refactoring of changeset_printer._show - use ctx.branch() instead of directly accessing the extra field "branch" - move definitions of locals ('extra' and 'branch') down to where they are used
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 24 Oct 2009 19:01:40 +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