summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-10 11:55:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-10 11:55:32 -0700
commit66d6511c536ad20a25801295cecfc79caea2f57b (patch)
treec1c00b02bd38e56875612b12c50cc6c868c5ee4a /git-mergetool.sh
parentMerge branch 'jc/hashmap-doc-init' into maint (diff)
parentt4205: indent here documents (diff)
downloadtgif-66d6511c536ad20a25801295cecfc79caea2f57b.tar.xz
Merge branch 'jk/t4205-cleanup' into maint
Test modernization. * jk/t4205-cleanup: t4205: indent here documents t4205: drop top-level &&-chaining
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions