summaryrefslogtreecommitdiff
path: root/xdiff/xutils.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 00:36:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 01:07:05 (GMT)
commitc93be3b539da06e2d89d613448dfadf83c48de53 (patch)
tree5b00eebb394e8ac071ff80c2edf8bc6abbd185e7 /xdiff/xutils.c
parent6fda05aebe6e36bfe87113f85b6e70f2b9b73e42 (diff)
downloadgit-c93be3b539da06e2d89d613448dfadf83c48de53.zip
git-c93be3b539da06e2d89d613448dfadf83c48de53.tar.gz
git-c93be3b539da06e2d89d613448dfadf83c48de53.tar.bz2
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 'xdiff/xutils.c')
0 files changed, 0 insertions, 0 deletions