summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-15 13:36:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-15 13:36:47 -0700
commit45b65a6b676639e62bae1367f3902bfc470e5661 (patch)
tree455f9684b98ad08e5457f3e6c03dcf92ed22e853 /builtin/merge-recursive.c
parentPrepare for 1.7.11.5 (diff)
parentlink_alt_odb_entry: fix read over array bounds reported by valgrind (diff)
downloadtgif-45b65a6b676639e62bae1367f3902bfc470e5661.tar.xz
Merge branch 'hv/link-alt-odb-entry' into maint
* hv/link-alt-odb-entry: link_alt_odb_entry: fix read over array bounds reported by valgrind
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions