Mercurial > hg

view tests/test-conflict.out @ 5855:a6ccb957fd07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 14 Jan 2008 09:00:23 +0100
parents 93a4e72b4f83
children 5af5f0f9d724
line wrap: on
line source

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