Andrew's git / gitweb.git / diff
?
add test case for recursive merge
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 00:36:16 +0000 (16:36 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 01:07:05 +0000 (17:07 -0800)
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>
No differences found