trailer: add test with an old style conflict block
authorChristian Couder <chriscool@tuxfamily.org>
Sun, 9 Nov 2014 09:23:43 +0000 (10:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 18:00:07 +0000 (10:00 -0800)
commit3d24a72...7dd9b57b864d119a533bdfdfaccd9161
tree41f8572...3bc07e3333aea0481d3477b1192f48f9copy hash to clipboard (tree)
parent61cfef4...a4bdacbb90866fa8fd0e0f0b16b2cafccopy hash to clipboard (diff)
t/t7513-interpret-trailers.sh