Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4567:622d8ed78b47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extensions: load modules in module/__init__.py form. For example, convert=/path/to/convert now works.
author Brendan Cully <brendan@kublai.com>
date Wed, 13 Jun 2007 13:46:40 -0700
parents 93a4e72b4f83
children
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