summaryrefslogtreecommitdiff
path: root/contrib/difftool/git-difftool-helper
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-31 17:42:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-31 17:42:17 -0800
commit6ac92294b30d7c8619cf15b531448f011dbdcdcc (patch)
tree43c48771b1ddef478d944cd0af7d257607515568 /contrib/difftool/git-difftool-helper
parentGIT 1.6.1.2 (diff)
parentmerge: fix out-of-bounds memory access (diff)
downloadtgif-6ac92294b30d7c8619cf15b531448f011dbdcdcc.tar.xz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: merge: fix out-of-bounds memory access
Diffstat (limited to 'contrib/difftool/git-difftool-helper')
0 files changed, 0 insertions, 0 deletions