diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-12 16:36:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-12 17:07:05 -0800 |
| commit | c93be3b539da06e2d89d613448dfadf83c48de53 (patch) | |
| tree | 5b00eebb394e8ac071ff80c2edf8bc6abbd185e7 /diffcore.h | |
| parent | 6fda05aebe6e36bfe87113f85b6e70f2b9b73e42 (diff) | |
| download | git-c93be3b539da06e2d89d613448dfadf83c48de53.tar.gz | |
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>
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions