t / t5100 / msg0014--scissorson commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   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>