From 01689909eb9f8366583c44b325d8d9ba259a2538 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Mon, 31 Mar 2014 15:11:46 -0700 Subject: comments: fix misuses of "nor" Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano --- git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-am.sh') 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.")" -- cgit v1.2.3