tests/test-merge9.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 11 Mar 2008 11:38:12 -0700
changeset 6226 bd61e44eb2cc
parent 6004 5af5f0f9d724
child 6336 4b0c9c674707
permissions -rw-r--r--
fetch: don't proceed if working directory is missing files (issue988)

adding bar
adding foo
adding quux1
adding quux2
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