Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 3881:c0a12e6441a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix copy detection corner case We were aborting if the copied from rev was before the cut-off limit, rather than the copied _to_ rev. The copied from rev can be arbitrarily old.
author Matt Mackall <mpm@selenic.com>
date Tue, 12 Dec 2006 17:52:33 -0600
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