Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 3449:c8686e3f0291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Testing the new changegroupsubset remote function in the ssh and http protocols.
author Eric Hopper <hopper@omnifarious.org>
date Wed, 18 Oct 2006 02:14:26 -0500
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge: 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
something else
=======
something
M a