From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Sep 2021 18:22:09 +0000 (-0700)
Subject: Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
X-Git-Tag: v2.34.0-rc0~63^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04d3761db214512fa29db39bd43e0b162396045c;p=thirdparty%2Fgit.git

Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes

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

04d3761db214512fa29db39bd43e0b162396045c