Mercurial > hg

view tests/test-resolve.out @ 11462:1b82a26635d7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 51021f4c80b5
children
line wrap: on
line source

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
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
% resolve -l, should be empty
% resolve -l, should be empty