summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2009-08-27 09:35:55 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-27 16:44:47 -0700
commit14c674e9dc52c4b93512b22748c01ca6ccdef7bd (patch)
treebac973d063fd0aa93e3e35ba1f9bc956b86d7fcd /builtin-merge-recursive.c
parenttests: disable interactive hunk selection tests if perl is not available (diff)
downloadtgif-14c674e9dc52c4b93512b22748c01ca6ccdef7bd.tar.xz
Make test case number unique
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions