Mercurial > hg

view tests/test-merge9.out @ 6046:588ad9227b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix to let test-hgwebdir pass fixes a regression introduced in changeset f25070ecf334
author Michele Cella <michele.cella@gmail.com>
date Fri, 08 Feb 2008 15:42:28 +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