Mercurial > hg

view tests/test-conflict.out @ 3750:0f550b87deb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compatibility fix for 'ln -sf'. ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't needed here, I simply dropped it.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 22:09:05 +0100
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