Mercurial > hg

view tests/test-merge9.out @ 4816:c10d3bc05a8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup.py not executable: change instructions at beginning of file
author Christian Ebert <blacktrash@gmx.net>
date Thu, 28 Jun 2007 02:11:54 +0200
parents dc5920ea12f8
children f191bc3916f7
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
merging foo 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