view tests/test-resolve.out @ 8313:b695392491e7

commit: be more verbose in the -u help text

Make the requirement of an argument for -u a little more explicit.

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