summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-22 14:34:34 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-22 14:34:34 +0900
commit985f59c042320ddf0a506e553d5eef9689ef4c32 (patch)
tree8c4a31914111f8b1ebcebbe8bcc4757d5d8c0a05 /git-mergetool.sh
parentGit 2.10.4 (diff)
parentshell: drop git-cvsserver support by default (diff)
downloadtgif-985f59c042320ddf0a506e553d5eef9689ef4c32.tar.xz
Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions