Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4675:6858a7477a5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change branches to sort 'active' branches first, and add an option to show only active branches.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 21 Jun 2007 10:40:09 -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