tests/test-merge9.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 26 Nov 2007 17:23:20 -0800
changeset 5554 2147a734dcf9
parent 5042 f191bc3916f7
child 6004 5af5f0f9d724
permissions -rw-r--r--
convert: tell the source repository when a rev has been converted This lets us roundtrip changes between svn and hg.

adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
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 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