Mercurial > hg
view tests/test-merge9.out @ 10060:f780b1098efc
templatekw: change {file_copies} behaviour, add {file_copies_switch}
{file_copies} template now displays file copies with or without the --copies
switch being set. A new {file_copies_switch} template implements the former
behaviour.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 13 Dec 2009 18:06:24 +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