summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 12:59:16 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-05 12:59:16 +0900
commitdc58c8554ab9ca8ae12944ce5a311a39d93835eb (patch)
tree495544c81e94b4d2af800e26a9b1f83796de2574 /git-mergetool.sh
parentMerge branch 'jk/war-on-sprintf' into maint-2.7 (diff)
parentGit 2.6.7 (diff)
downloadtgif-dc58c8554ab9ca8ae12944ce5a311a39d93835eb.tar.xz
Merge branch 'maint-2.6' into maint-2.7
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions