[PATCH] Finish making --emu23 equivalent to pure 2-way merge.
authorJunio C Hamano <junkio@cox.net>
Sat, 11 Jun 2005 09:50:51 +0000 (02:50 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 13 Jun 2005 03:40:20 +0000 (20:40 -0700)
commit32192e6...22d78347448cfc0572827d6e64e0de28
tree460a1aa...e3734888a6e25721c11e39deede40084copy hash to clipboard (tree)
parente7f9bc4...1c8519468c33e1d882fb02cbe9c1ea55copy hash to clipboard (diff)
read-tree.c
t/t1000-read-tree-m-3way.sh
t/t1005-read-tree-m-2way-emu23.sh