tests/test-resolve.out
author Cédric Duval <cedricduval@free.fr>
Fri, 10 Jul 2009 19:45:31 +0200
changeset 9130 335f749cc369
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
gendoc: fall back to pure modules if C extensions are not available (issue1711)

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 up --clean' to abandon
% resolve -l, should be empty