Merge branch 'pt/am-builtin-abort-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2015 22:45:32 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2015 22:45:32 +0000 (15:45 -0700)
"git am" that was recently reimplemented in C had a performance
regression in "git am --abort" that goes back to the version before
an attempted (and failed) patch application.

* pt/am-builtin-abort-fix:
am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

1  2 
builtin/am.c
diff --cc builtin/am.c
Simple merge