summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-24 15:29:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-24 15:29:35 -0700
commit74567ac0018247cbe08a5c1a1b1176a51ec2e49e (patch)
treebcc221dfaa8fed9d0119024493862946d27dfb87 /mergetools/tortoisemerge
parentMerge branch 'sd/t3200-branch-m-test' into maint (diff)
parentdocs/pretty-formats: stress that %- removes all preceding line-feeds (diff)
downloadtgif-74567ac0018247cbe08a5c1a1b1176a51ec2e49e.tar.xz
Merge branch 'sg/doc-pretty-formats' into maint
Doc update. * sg/doc-pretty-formats: docs/pretty-formats: stress that %- removes all preceding line-feeds
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions