tests/test-merge9.out
author Brendan Cully <brendan@kublai.com>
Thu, 05 Jul 2007 12:24:26 -0700
changeset 4812 a5209b0487e0
parent 4682 dc5920ea12f8
child 5042 f191bc3916f7
permissions -rw-r--r--
convert: export revmap to source. Sources may be able to use it to optimise their own log fetching

adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
merging foo failed!
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo
merging baz failed!
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 1
  hg merge 2