Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge9.out @ 5199:94e77a174f55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Quote ^ and ~ chars in test-parentrevspec. At least ^ causes problems on some sh implementations.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 18 Aug 2007 20:21:14 +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