tests/test-merge9.out
author Steve Borho <steve@borho.org>
Wed, 05 Sep 2007 21:53:59 +0200
changeset 5284 f8c36b215281
parent 5045 f191bc3916f7
permissions -rw-r--r--
hgk: add repo root to window title

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