Mercurial > hg-stable

view tests/test-conflict.out @ 3181:3637d5d17cbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documentation fixes for addremove. - It is no longer deprecated, but the short help still included (DEPRECATED). - Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 27 Sep 2006 21:43:45 +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