From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Dec 2006 00:36:16 +0000 (-0800)
Subject: add test case for recursive merge
X-Git-Tag: v1.5.0-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c93be3b539da06e2d89d613448dfadf83c48de53?hp=c93be3b539da06e2d89d613448dfadf83c48de53

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>
---