trailer: add test with an old style conflict block
authorChristian Couder <redacted>
Sun, 9 Nov 2014 09:23:43 +0000 (10:23 +0100)
committerJunio C Hamano <redacted>
Mon, 10 Nov 2014 18:00:07 +0000 (10:00 -0800)
commit3d24a7267dd9b57b864d119a533bdfdfaccd9161
tree41f857223bc07e3333aea0481d3477b1192f48f9
parent61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc
trailer: add test with an old style conflict block

Signed-off-by: Christian Couder <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7513-interpret-trailers.sh
git clone https://git.99rst.org/PROJECT