Mercurial > hg

view tests/test-conflict.out @ 2493:9c660e691e90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
print message after backout that tells that backout adds new head.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 23 Jun 2006 17:33:10 -0700
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