Mercurial > hg

view tests/test-merge9.out @ 6208:c88b9e597588

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --keep-tmp to run-tests.py to debug test environment When set, you can find the working dir of the test run as a uniquely named subdirectory of --tmpdir so you can inspect it.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Wed, 05 Mar 2008 08:00:05 +0100
parents 5af5f0f9d724
children 4b0c9c674707
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
1 files updated, 1 files merged, 0 files removed, 1 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
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 1
  hg merge 2