diff options
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.")" |