summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 15:11:46 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 15:29:27 -0700
commit01689909eb9f8366583c44b325d8d9ba259a2538 (patch)
tree6a4635a267885b3429f55c81a9a1c8787e36802e /git-am.sh
parente34b272344c1e7eb640dcce5990a75460240daed (diff)
downloadgit-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz
comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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.")"