Mercurial > hg
view tests/test-update-renames.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 | 4f11978ae45d |
children |
line wrap: on
line source
merging a and b to b warning: conflicts during merge. merging b failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges