view tests/test-merge-force.out @ 8313:b695392491e7

commit: be more verbose in the -u help text

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

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b