2 commits

Author	SHA1	Message	Date
Johannes Schindelin	f953831e03	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>	2006-12-12 21:55:37 -08:00
Junio C Hamano	c93be3b539	add test case for recursive merge ... This test case is based on the bug report by Shawn Pearce. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-12-12 17:07:05 -08:00