global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

code and test: fix misuses of "nor"

Browse Source 
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Justin Lebar
2014-03-31 15:11:47 -07:00
committed by Junio C Hamano
parent 01689909eb
commit 235e8d5914
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/clean.c
View File

@@ -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)