tests/test-resolve.out
author Sune Foldager <cryo@cyanite.org>
Tue, 24 Nov 2009 09:49:23 +0100
changeset 9915 806e6b6cb8d8
parent 9468 b2310903c462
child 11451 51021f4c80b5
permissions -rw-r--r--
ancestor: improve docstring The term "least common ancestor" is highly ambiguous.

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