Mercurial > hg

view tests/test-merge9.out @ 6374:31a01e3d99cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 24 Mar 2008 16:20:15 +0100
parents 4b0c9c674707
children 368a4ec603cc
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
created new head
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