Three-way merge: fix silly bug that made trivial merges not work
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 06:32:53 +0000 (23:32 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 06:32:53 +0000 (23:32 -0700)
commita76d74f...7146d1785cdefc58a91c50ab9acec775
tree12023d5...3724ec1d3b4f2faddb4206b48afa2a2bcopy hash to clipboard (tree)
parent6ee67f2...10d0060bee45eee0b83fe42143441589copy hash to clipboard (diff)
read-tree.c