Merge branch 'lt/request-pull'

diff --git a/git-am.sh b/git-am.sh
index 1b638e83b13bf4a2802cb035b437433177b3d34f..ee61a77d717a7210a1cf614914ab62788fd5e4fc 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -530,7 +530,7 @@ Use \"git am --abort\" to remove it.")"
                esac
        fi
 
-       # Make sure we are not given --skip, --continue, nor --abort
+       # Make sure we are not given --skip, --continue, or --abort
        test "$skip$resolved$abort" = "" ||
                die "$(gettext "Resolve operation not in progress, we are not resuming.")"