diff options
| author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:33 -0700 |
| commit | 235e8d591480d7e1378c27fe65c5529625d4b5be (patch) | |
| tree | ecfd18463fa83687c6926852b373d8040d403234 /builtin/clean.c | |
| parent | 01689909eb9f8366583c44b325d8d9ba259a2538 (diff) | |
| download | git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.gz git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.xz | |
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/clean.c')
| -rw-r--r-- | builtin/clean.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 55029577f..977a068f1 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!interactive && !dry_run && !force) { if (config_set) - die(_("clean.requireForce set to true and neither -i, -n nor -f given; " + die(_("clean.requireForce set to true and neither -i, -n, nor -f given; " "refusing to clean")); else - die(_("clean.requireForce defaults to true and neither -i, -n nor -f given; " - "refusing to clean")); + die(_("clean.requireForce defaults to true and neither -i, -n, nor -f given;" + " refusing to clean")); } if (force > 1) |