summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-29 22:17:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-29 22:17:57 -0700
commit565301e41670825ceedf75220f2918ae76831240 (patch)
tree078212ae12b6a63229c350ba07e92a796f54d21f /t/t7610-mergetool.sh
parentMerge branch 'jt/itimer-autoconf' (diff)
parentGit 2.1.2 (diff)
downloadtgif-565301e41670825ceedf75220f2918ae76831240.tar.xz
Sync with 2.1.2
* maint: Git 2.1.2
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions