trailer: reuse ignore_non_trailer() to ignore conflict lines
authorChristian Couder <chriscool@tuxfamily.org>
Sun, 9 Nov 2014 09:23:42 +0000 (10:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 18:00:02 +0000 (10:00 -0800)
commit61cfef4...a4bdacbb90866fa8fd0e0f0b16b2cafc
tree75f68e6...c37708205075003845e1ff8566fd1ef9copy hash to clipboard (tree)
parent8c38458...2363abf3fb5cf2fe61bc455554f50c68copy hash to clipboard (diff)
t/t7513-interpret-trailers.sh
trailer.c