Mercurial > hg
view tests/test-conflict.out @ 11462:1b82a26635d7 stable
mq: qimport cleanup on fail (issue2214)
save state of successfully added patches and ensure
cleanup on the way out.
author | Vishakh H <vsh426@gmail.com> |
---|---|
date | Tue, 29 Jun 2010 03:09:42 +0530 |
parents | b2310903c462 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig