Mercurial > hg
view tests/test-merge9.out @ 5780:0ae953487255
Obfuscate (instead of just escape) contact/owner in gitweb summary.
This could contain an email address.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 01 Jan 2008 17:12:37 +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