tree d1b9565216e59cb8af65829bf04fe18e58d964c3
parent 8042ed1cebd37419ff38f540482355c0f1d30936
author Johannes Schindelin <Johannes.Schindelin@gmx.de> 1165979139 +0100
committer Junio C Hamano <junkio@cox.net> 1165989337 -0800

merge-recursive: add/add really is modify/modify with an empty base

Unify the handling for cases C (add/add) and D (modify/modify).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>