Merge branch 'jk/avoid-unbounded-alloca'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:48 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:48 +0000 (09:56 -0700)
* jk/avoid-unbounded-alloca:
tree-diff: avoid alloca for large allocations

1  2 
tree-diff.c
diff --cc tree-diff.c
Simple merge