summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2014-11-09 10:23:43 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-10 10:00:07 -0800
commit3d24a7267dd9b57b864d119a533bdfdfaccd9161 (patch)
tree41f857223bc07e3333aea0481d3477b1192f48f9 /git-gui
parenttrailer: reuse ignore_non_trailer() to ignore conflict lines (diff)
downloadtgif-3d24a7267dd9b57b864d119a533bdfdfaccd9161.tar.xz
trailer: add test with an old style conflict block
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions