t / t5100 / msg0014--scissorson commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1This teaches mailinfo the scissors -- >8 -- mark; the command ignores
   2everything before it in the message body.
   3
   4Signed-off-by: Junio C Hamano <gitster@pobox.com>