Mercurial > hg

view tests/test-conflict.out @ 10540:dd9d057465c1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
progress: provide an explicit disable method for developers The other three checks for disabling the progress bar have serious side effects for any class that derives from ui.ui()
author Steve Borho <steve@borho.org>
date Tue, 23 Feb 2010 23:10:01 -0600
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