Mercurial > hg

view tests/test-conflict.out @ 5484:07bdb5e5d08c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update convert help text Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.
author "Rafael Villar Burke <pachi@rvburke.com>"
date Fri, 02 Nov 2007 20:09:21 +0100
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