Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4371:abeb3edb2b4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: make parents() faster. This allows localrepository.status() to avoid reading all but the first 40 bytes of the dirstate in the common case of running "hg status".
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 24 Apr 2007 11:46:15 -0700
parents 46280c004f22
children 93a4e72b4f83
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
something else
=======
something
M a