summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-28 13:52:29 -0700
commit88fb4aa23a5840f46cb20e1c66420de9796da6a2 (patch)
treecc8679b8e7c3b87b895e871547a54e5899269624 /mergetools/winmerge
parentMerge branch 'sb/submodule-update-initial-runs-custom-script' into maint (diff)
parentt3600: rename test to describe its functionality (diff)
downloadtgif-88fb4aa23a5840f46cb20e1c66420de9796da6a2.tar.xz
Merge branch 'sb/t3600-rephrase' into maint
A test retitling. * sb/t3600-rephrase: t3600: rename test to describe its functionality
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions