summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:24 -0800
commitc53d1e49f9b87cbfb7e53b17cd935e8c54469d6b (patch)
tree6a779aa712ed5061235c4692ac2d7d288e97fac0 /t/t3030-merge-recursive.sh
parentMerge branch 'ef/setenv-putenv' (diff)
parenttest: errors preparing for a test are not special (diff)
downloadtgif-c53d1e49f9b87cbfb7e53b17cd935e8c54469d6b.tar.xz
Merge branch 'jn/test-cleanup-7006'
* jn/test-cleanup-7006: test: errors preparing for a test are not special
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions