Mercurial > hg

view tests/test-resolve.out @ 10712:fbe138da6b38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: 1 variable name for overwriting candidates
author Christian Ebert <blacktrash@gmx.net>
date Tue, 16 Mar 2010 22:28:23 +0100
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