t / t5100 / msg0010on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   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>