tests/test-merge9.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 25 Jun 2007 11:29:17 -0700
changeset 4714 a741293793f6
parent 4681 dc5920ea12f8
child 5045 f191bc3916f7
permissions -rw-r--r--
Make changeset_printer respect ui diffopts

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