git-read-tree: fix up two-way merge
commite6ee623b7be2a59a3f3d1ff8c513d72b6f15344f
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 05:59:59 +0000 (5 22:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 05:59:59 +0000 (5 22:59 -0700)
treed71ef3a9328c61023140729b9de1bb0cda0192f2
parent220a0b527bd6ecd30a9d6dfed22195c95e6f445a
git-read-tree: fix up two-way merge

This is starting to look better.
read-tree.c