tests/test-merge9.out
author Matt Mackall <mpm@selenic.com>
Thu, 10 Apr 2008 15:02:24 -0500
changeset 6512 368a4ec603cc
parent 6336 4b0c9c674707
child 6518 92ccccb55ba3
permissions -rw-r--r--
merge: introduce mergestate

adding bar
adding foo
adding quux1
adding quux2
created new head
merging bar
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 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 to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 1
  hg merge 2