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