summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-17 12:03:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-17 12:03:02 -0700
commit02dad2673b2bea4d28ca1b79c2e40fb8ad170959 (patch)
treea9c2d25b7d967768e76032ceb81d2ec864fdc278 /t/lib-httpd
parentGit 2.5.2 (diff)
parentam --skip/--abort: merge HEAD/ORIG_HEAD tree into index (diff)
downloadtgif-02dad2673b2bea4d28ca1b79c2e40fb8ad170959.tar.xz
Merge branch 'js/maint-am-skip-performance-regression' into maint
* js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
Diffstat (limited to 't/lib-httpd')
0 files changed, 0 insertions, 0 deletions