Mercurial > hg

view tests/test-conflict.out @ 6610:92b5be854677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset ff5ef3c0fe10 (fixes wrong documentation)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 19 May 2008 10:19:59 +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