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

commit: be more verbose in the -u help text

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

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')