Mercurial > hg

view tests/test-conflict.out @ 4960:c79e3fa6dc29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused pprint import and the commented line which used it before.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:43:29 +0200
parents 93a4e72b4f83
children 5af5f0f9d724
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warning: conflicts during merge.
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< my
something else
=======
something
>>>>>>> other
M a