From 235e8d591480d7e1378c27fe65c5529625d4b5be Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Mon, 31 Mar 2014 15:11:47 -0700 Subject: code and test: fix misuses of "nor" Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index 26b2986abe..5d594a4743 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const char *argv[], if (argc == 0 && only && amend) only_include_assumed = _("Clever... amending the last one with dirty index."); if (argc > 0 && !also && !only) - only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths..."); + only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths..."); if (!cleanup_arg || !strcmp(cleanup_arg, "default")) cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; else if (!strcmp(cleanup_arg, "verbatim")) -- cgit v1.2.1