summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-25 11:08:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-25 11:08:09 -0700
commit66d913367d2344f313210e6441bd41e975a47b1d (patch)
tree7a0965034e8afa0bbeb9a2961f961cfe3bbb720f /t/t3030-merge-recursive.sh
parentMerge branch 'dm/configure-iconv-locale-charset' (diff)
parentt/lib-terminal: make TTY a lazy prerequisite (diff)
downloadtgif-66d913367d2344f313210e6441bd41e975a47b1d.tar.xz
Merge branch 'jk/lib-terminal-lazy'
The test helper lib-terminal always run an actual test_expect_* when included, which screwed up with the use of skil-all that may have to be done later. * jk/lib-terminal-lazy: t/lib-terminal: make TTY a lazy prerequisite
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions