Mercurial > hg

view tests/test-conflict.out @ 6664:1e3c1f010808

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truncate input to 1K when using pygments guess_lexer. This function appears to be exponential with input length.
author Brendan Cully <brendan@kublai.com>
date Thu, 12 Jun 2008 00:11:09 -0700
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