Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge9.out @ 5408:36794dbe66a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test workingctx exec/link bit for copies. Also, make the test runnable on platforms without symlinks.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Oct 2007 15:13:50 +0200
parents f191bc3916f7
children
line wrap: on
line source

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