Mercurial > hg

view tests/test-conflict.out @ 11701:84fb29f5e0d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix qimport --name --existing --force on win32 os.rename() does not overwrite existing targets on Windows.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 28 Jul 2010 11:07:20 +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