From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:46 +0000 (-0700)
Subject: Merge branch 'en/am-abort-fix' into maint
X-Git-Tag: v2.33.1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b809c3d9005cdbf6b193a78a32240b247ee81b36;p=thirdparty%2Fgit.git

Merge branch 'en/am-abort-fix' into maint

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
---

b809c3d9005cdbf6b193a78a32240b247ee81b36