summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:38:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:38:12 -0700
commitfc78791b7c2cb17a461e7881ee4585b3eafda4b6 (patch)
tree43422f424856ada0dcc30b360946d781a7f43f16 /Documentation/git-difftool.txt
parentMerge branch 'tr/push-no-verify-doc' into maint (diff)
parenturls.txt: avoid auto converting to hyperlink (diff)
downloadtgif-fc78791b7c2cb17a461e7881ee4585b3eafda4b6.tar.xz
Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maint
* nd/urls-doc-no-file-hyperlink-fix: urls.txt: avoid auto converting to hyperlink
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions