diff options
| author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:27 -0700 |
| commit | 01689909eb9f8366583c44b325d8d9ba259a2538 (patch) | |
| tree | 6a4635a267885b3429f55c81a9a1c8787e36802e /git-am.sh | |
| parent | e34b272344c1e7eb640dcce5990a75460240daed (diff) | |
| download | git-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-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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.")" |