Merge branch 'js/maint-am-skip-performance-regression' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:03:02 +0000 (12:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:03:02 +0000 (12:03 -0700)
* js/maint-am-skip-performance-regression:
  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge