Mercurial > hg
view tests/test-merge9.out @ 7836:bc0a87123ab8
Merge with main
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 06 Mar 2009 12:35:48 -0800 |
parents | 9fe7e6acf525 |
children | 30cb79d84352 |
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 to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon U bar R baz 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon % show unresolved U bar R baz % unmark baz % show U bar U baz % re-resolve baz merging baz and foo to baz % after U bar R baz % resolve all warning abort: no files or directories specified; use --all to remerge all files % resolve all merging bar warning: conflicts during merge. merging bar failed! % after U bar R baz