summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2014-11-09 10:23:43 +0100
committerJunio C Hamano <gitster@pobox.com>2014-11-10 10:00:07 -0800
commit3d24a7267dd9b57b864d119a533bdfdfaccd9161 (patch)
tree41f857223bc07e3333aea0481d3477b1192f48f9 /commit.h
parent61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc (diff)
downloadgit-3d24a7267dd9b57b864d119a533bdfdfaccd9161.tar.gz
trailer: add test with an old style conflict blockcc/interpret-trailers-more
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions