Andrew's git / gitweb.git / diff
?
git-read-tree: fix up three-way merge tests
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 03:28:33 +0000 (20:28 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 03:28:33 +0000 (20:28 -0700)
When we collapse three entries, we need to check all of the
collapsed entries against the old pre-merge state.

No differences found