Mercurial > hg

view tests/test-merge9.out @ 5941:b710296c904a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update usage message in test-glog.out AKA: Remind Thomas to run tests even after trivial changes.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 25 Jan 2008 21:09:14 +0100
parents f191bc3916f7
children 5af5f0f9d724
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