![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 00:36:16 +0000 (16:36 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 01:07:05 +0000 (17:07 -0800) | ||
| commit | c93be3b539da06e2d89d613448dfadf83c48de53 | |
| tree | 5b00eebb394e8ac071ff80c2edf8bc6abbd185e7 | tree | snapshot |
| parent | 6fda05aebe6e36bfe87113f85b6e70f2b9b73e42 | commit | diff |
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>
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>
| t/t6024-recursive-merge.sh | [new file with mode: 0755] | blob |