summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-21 12:12:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-21 12:12:24 -0700
commitd3115a35fc29e7a55131a677878e67725d4cc165 (patch)
treeb6c0ecad93b631d2be36f4677aede75221a60322 /ll-merge.c
parentMerge branch 'pt/enter-repo-comment-fix' into maint (diff)
parentt5551: make EXPENSIVE test cheaper (diff)
downloadtgif-d3115a35fc29e7a55131a677878e67725d4cc165.tar.xz
Merge branch 'jk/test-annoyances' into maint
Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions