summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-07 15:15:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-07 15:15:23 -0800
commit696c35972fdb0b80e68e61fba4055f29777ca3a9 (patch)
treea794843e78da68e878f03f6749b64a2865066bd9 /Documentation/merge-config.txt
parentMerge branch 'ft/transport-report-segv' into maint (diff)
parentt9902: protect test from stray build artifacts (diff)
downloadtgif-696c35972fdb0b80e68e61fba4055f29777ca3a9.tar.xz
Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into maint
Scripts to test bash completion was inherently flaky as it was affected by whatever random things the user may have on $PATH. * jc/do-not-let-random-file-interfere-with-completion-tests: t9902: protect test from stray build artifacts
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions