tests/test-resolve.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Thu, 03 Dec 2009 14:14:44 +0900
branchstable
changeset 9993 8bce1e0d2801
parent 9468 b2310903c462
child 11451 51021f4c80b5
permissions -rw-r--r--
alias: do not crash when aliased command has no usage help text

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