Mercurial > hg

view tests/test-conflict.out @ 4561:a73d80d6385a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revive commands.dispatch as a simple way to call hg from other pythons scripts. This was already used by hg-ssh and others and is really convenient if you just want a native equivalent of calling the command line version.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 12 Jun 2007 17:39:57 +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