summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2009-06-22 09:30:38 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-22 00:44:14 -0700
commit1ab012cf811abba5745fa0da70db963decd65f21 (patch)
tree31155ff97873905e104db23ecab24b214b4b0629 /builtin-merge-recursive.c
parentMerge branch 'sb/maint-1.6.0-add-config-fix' into maint (diff)
downloadtgif-1ab012cf811abba5745fa0da70db963decd65f21.tar.xz
t3700-add: add a POSIXPERM prerequisite to a new test
The new test does a 'chmod 0', which does not have the intended effect on Windows. 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