merge-recursive: distinguish "removed" and "overwritten" messages
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Wed, 11 Aug 2010 08:38:06 +0000 (10:38 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 17:36:05 +0000 (10:36 -0700)
commit08402b0...09bc501deb97cf4388a78ee9f87092c6
treec0b4207...0ae69970a21b4e94725d4318dc6ea6f5copy hash to clipboard (tree)
parent23cbf11...5c08c6d0ab0fd0d6f2dc5a32ca31c745copy hash to clipboard (diff)
merge-recursive.c
unpack-trees.c
unpack-trees.h