Mercurial > hg

view tests/test-conflict.out @ 6835:08d9e0f974d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make mq and tags hardlink safe The code didn't check for modes like "r+" or "rb+". Many thanks to agriffis for noticing it.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 23 Jul 2008 16:08:20 +0200
parents 4b0c9c674707
children 92ccccb55ba3
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
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