summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-04 10:43:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-04 10:43:23 -0700
commit3d3caf0b78106c390fc5daceb95ee968312765dd (patch)
treed41a558b9e3cc7ad256636f103fdf243a8bf7c19 /mergetools
parentMerge branch 'ee/clean-test-fixes' into maint (diff)
parentGit 2.4.9 (diff)
downloadtgif-3d3caf0b78106c390fc5daceb95ee968312765dd.tar.xz
Sync with 2.4.9
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions