Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge9.out @ 5287:c6f932d3e0f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't decode unicode strings. This does not work with python2.3 and is probably not useful anyway with 2.4.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Sep 2007 16:14:51 +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