From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Sep 2021 20:44:45 +0000 (-0700)
Subject: Merge branch 'en/am-abort-fix'
X-Git-Tag: v2.34.0-rc0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c84b007c41638814137d296e75446a9b4865fd2;p=thirdparty%2Fgit.git

Merge branch 'en/am-abort-fix'

When "git am --abort" fails to abort correctly, it still exited
with exit status of 0, which has been corrected.

* en/am-abort-fix:
  am: fix incorrect exit status on am fail to abort
  t4151: add a few am --abort tests
  git-am.txt: clarify --abort behavior
---

6c84b007c41638814137d296e75446a9b4865fd2