summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-27 10:01:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-27 10:01:21 -0800
commit28db11169b53695827b180e4ee11c33bf2ec116a (patch)
treee49b3956cbc52c728b99190c4edffbba9996c73d /mergetools/opendiff
parentMerge branch 'jn/less-reconfigure' into maint (diff)
parentuser-manual: typofix (ofthe->of the) (diff)
downloadtgif-28db11169b53695827b180e4ee11c33bf2ec116a.tar.xz
Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint
* wk/man-deny-current-branch-is-default-these-days: user-manual: typofix (ofthe->of the) user-manual: Update for receive.denyCurrentBranch=refuse
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions