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)
commite6ee623...7be2a59a3f3d1ff8c513d72b6f15344f
treed71ef3a...328c61023140729b9de1bb0cda0192f2copy hash to clipboard (tree)
parent220a0b5...7bd6ecd30a9d6dfed22195c95e6f445acopy hash to clipboard (diff)
read-tree.c