Merge branch 'jc/gitlink' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 10:16:50 +0000 (03:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 10:16:50 +0000 (03:16 -0700)
* jc/gitlink:
  read-tree: reorganize bind_merge code.

1  2 
read-tree.c

diff --cc read-tree.c
Simple merge