about summary refs log tree commit
path: root/git-am.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index bbea43075b..e92e5bb121 100755
--- 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.")"