diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2014-11-09 09:23:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-10 18:00:07 (GMT) |
| commit | 3d24a7267dd9b57b864d119a533bdfdfaccd9161 (patch) | |
| tree | 41f857223bc07e3333aea0481d3477b1192f48f9 /builtin/merge.c | |
| parent | 61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc (diff) | |
| download | git-3d24a7267dd9b57b864d119a533bdfdfaccd9161.zip git-3d24a7267dd9b57b864d119a533bdfdfaccd9161.tar.gz git-3d24a7267dd9b57b864d119a533bdfdfaccd9161.tar.bz2 | |
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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions