diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2014-11-09 10:23:43 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-11-10 10:00:07 -0800 |
| commit | 3d24a7267dd9b57b864d119a533bdfdfaccd9161 (patch) | |
| tree | 41f857223bc07e3333aea0481d3477b1192f48f9 /Documentation/git-submodule.txt | |
| parent | trailer: reuse ignore_non_trailer() to ignore conflict lines (diff) | |
| download | tgif-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 'Documentation/git-submodule.txt')
0 files changed, 0 insertions, 0 deletions