summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-04 11:39:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-04 11:39:19 -0800
commit9a8c740225bbd551d85a353a7bd33d57aafaca06 (patch)
tree87cd8a7a423dd9cba802c2ef3063f83a22745f9c /mergetools
parentMerge branch 'da/difftool' into maint (diff)
downloadtgif-9a8c740225bbd551d85a353a7bd33d57aafaca06.tar.xz
Prepare for 2.6.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions