Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2354:16276b1c0658

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Manifest groups may be empty, so don't abort in this case (fixes issue210). Only abort on empty changelog and file revlogs.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 31 May 2006 22:25:20 +0200
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