comments: fix misuses of "nor"

[thirdparty/git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index bbea43075be030c272ef0d8e4cb9c25a179d4e53..e92e5bb121d50d21f104c3f66e90a7c1db5f34a6 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -523,7 +523,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.")"