Mercurial > hg

view tests/test-resolve.out @ 11327:6c469f2f9f12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: use ui.formatted() instead of ui.plain().
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Mon, 07 Jun 2010 15:33:03 +0200
parents b2310903c462
children 51021f4c80b5
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