summaryrefslogtreecommitdiff
path: root/t/t5100/msg0007
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 11:59:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 11:59:39 -0700
commite596fd295fbb6e7453cd541554ba27ab185f870d (patch)
tree724b2b3c80a66d9ddd10b517278e0e77b20890e0 /t/t5100/msg0007
parentMerge branch 'jm/maint-misc-fix' into maint (diff)
parentDocumentation: Allow custom diff tools to be specified in 'diff.tool' (diff)
downloadtgif-e596fd295fbb6e7453cd541554ba27ab185f870d.tar.xz
Merge branch 'rr/doc-content-type' into maint
* rr/doc-content-type: Documentation: Allow custom diff tools to be specified in 'diff.tool' Documentation: Add diff.<driver>.* to config Documentation: Move diff.<driver>.* from config.txt to diff-config.txt Documentation: Add filter.<driver>.* to config
Diffstat (limited to 't/t5100/msg0007')
0 files changed, 0 insertions, 0 deletions