Mercurial > hg

view tests/test-conflict.out @ 6061:de08788511d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-keyword: make it run under Windows - don't cat symlink, content differs - rewrite OS specific messages - generate symlink with a bundle
author Patrick Mezard <pmezard@gmail.com>
date Sat, 09 Feb 2008 20:17:09 +0100
parents 5af5f0f9d724
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
warning: conflicts during merge.
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
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig