tests/test-conflict.out
author Brendan Cully <brendan@kublai.com>
Wed, 01 Aug 2007 14:32:53 -0700
changeset 5049 41284ad94852
parent 4385 93a4e72b4f83
permissions -rw-r--r--
Merge with stable

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