view tests/test-merge5.out @ 10734:7a0502a6f9a1

patchbomb: --desc implies --intro

For a single patch, an introductory text should not remain unsent
if --intro has been omitted, as the intent of --desc is clear.

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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved