tests/test-merge9.out
author David Reiss <davidn@gmail.com>
Fri, 16 May 2008 00:48:23 -0700
changeset 6632 aa3f61884a48
parent 6336 4b0c9c674707
child 6512 368a4ec603cc
permissions -rw-r--r--
convert.monotone: fix quotes and backslashes in change descriptions.

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