Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9.out @ 5474:5d8f5ad45c12
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 19 Oct 2007 18:25:28 -0500 |
parents | f191bc3916f7 |
children |
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