summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-29 13:28:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-29 13:28:01 -0800
commitd92466ee25ca2dd79c6f0f7a804f765a5930990c (patch)
tree17c2ca2b64d28866962c3874bbf48b454edd6f31 /git-mergetool--lib.sh
parentMerge branch 'rs/cocci' into maint (diff)
parentdoc: fix location of 'info/' with $GIT_COMMON_DIR (diff)
downloadtgif-d92466ee25ca2dd79c6f0f7a804f765a5930990c.tar.xz
Merge branch 'ps/common-info-doc' into maint
Doc fix. * ps/common-info-doc: doc: fix location of 'info/' with $GIT_COMMON_DIR
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions