Make 'read-tree' do a few more of the trivial merge cases.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 16:11:49 +0000 (09:11 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 16:11:49 +0000 (09:11 -0700)
commit43f9126...a493c4888b4ff2a7997ccc4a381e7238
tree26f1764...3928139d69d2249c78f24d7be4b0d9fdcopy hash to clipboard (tree)
parentaee4619...5f52857fa04999b2a988986dd8c84abacopy hash to clipboard (diff)
read-tree.c