Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2755:6c2c10cedf7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help <extension> doesn't understand this form without this patch.
author Brendan Cully <brendan@kublai.com>
date Tue, 01 Aug 2006 14:56:54 -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