Mercurial > hg

view tests/test-conflict.out @ 7599:7bf7c073375e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lowercase ui.debug and assert output This does not effect the log or status commands and should be okay according to the compatibility rules.
author Martin Geisler <mg@daimi.au.dk>
date Sat, 03 Jan 2009 17:15:21 +0100
parents 92ccccb55ba3
children 9fe7e6acf525
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
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig