t / t5100 / msg0010on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1"Subject: " isn't in the static array "header", and thus
   2memcmp("Subject: ", header[i], 7) will never match.
   3
   4Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
   5Signed-off-by: Junio C Hamano <gitster@pobox.com>