]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 06:02:47 +0000 (23:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 06:02:47 +0000 (23:02 -0700)
* jc/maint-1.6.0-read-tree-overlay:
  read-tree A B C: do not create a bogus index and do not segfault

1  2 
unpack-trees.c

diff --cc unpack-trees.c
Simple merge