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

Junio C Hamano committed Sep 17, 2015 at 12:03 UTC 02dad2673b2bea4d28ca1b79c2e40fb8ad170959

No changes.