Mercurial > hg
view tests/test-merge9.out @ 9874:c51494c53841 stable
qseries: don't truncate the patch name (issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
---|---|
date | Tue, 17 Nov 2009 22:16:41 +0100 |
parents | b2310903c462 |
children |
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 update -C' 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 update -C' to abandon % show unresolved U bar R baz % unmark baz % show U bar U baz M bar M baz M quux2 ? bar.orig % 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