view tests/test-resolve.out @ 8779:708938509732

Improve English for help text of many core hg commands.

co-author: Greg Ward <[e-mail]>

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