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)
commit76f3834...b4199f65e8c897ebf4f9ce1d3a24378b
tree463e3f8...4ee1f7700ec81caf636d9ec3106e6fc1copy hash to clipboard (tree)
parent02ede67...d45973f9f8d07db7896a537de97d21b6copy hash to clipboard (diff)
read-tree.c