git-read-tree: fix up two-way merge
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 05:59:59 +0000 (22:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 05:59:59 +0000 (22:59 -0700)
This is starting to look better.

No differences found