tests/test-conflict.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 24 Apr 2007 11:46:15 -0700
changeset 4373 abeb3edb2b4e
parent 4365 46280c004f22
child 4387 93a4e72b4f83
permissions -rw-r--r--
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".

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