tests/test-merge9.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Jun 2007 15:28:17 +0200
changeset 4726 f6e961c0155b
parent 4681 dc5920ea12f8
child 5045 f191bc3916f7
permissions -rw-r--r--
Fix and test 'hg backout' without or with too many revisions.

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