Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'

[git] / t / t5100 / msg0014--scissors

This teaches mailinfo the scissors -- >8 -- mark; the command ignores
everything before it in the message body.

Signed-off-by: Junio C Hamano <gitster@pobox.com>