summaryrefslogtreecommitdiff
path: root/builtin-merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-14 18:59:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-14 18:59:14 -0800
commitb599672316ae0e0cf827e5e2cd6d3bb403d7b8cd (patch)
tree3214dc21b1fd0945d4f3760ba5f121324fd6ee97 /builtin-merge-index.c
parentStart 1.7.0 maintenance track (diff)
parentfix minor memory leak in get_tree_entry() (diff)
downloadtgif-b599672316ae0e0cf827e5e2cd6d3bb403d7b8cd.tar.xz
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: fix minor memory leak in get_tree_entry()
Diffstat (limited to 'builtin-merge-index.c')
0 files changed, 0 insertions, 0 deletions