Make "read-tree" know how to do a "1-way merge".
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 18:41:18 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 18:41:18 +0000 (11:41 -0700)
commita3a6523...dba0f90a0b8e06fa7b5f269fe5126761
tree7315346...212d77d19f8c7c2fc82c5beda21e4a95copy hash to clipboard (tree)
parentca016f0...4e7e508407fe17e121fcd520fbb7c865copy hash to clipboard (diff)
read-tree.c