Mercurial > hg

view tests/test-conflict.out @ 6122:800e2756c9ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add line anchors to annotate, changeset, diff, file views for hgweb
author Edward Lee <edward.lee@engineering.uiuc.edu>
date Tue, 04 Sep 2007 22:25:37 -0500
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