Merge branch 'js/rebase-i-final'

gitster · gitster · commit 2f0e14e649d6 · 2017-10-09T18:59:16.000+09:00
* js/rebase-i-final:
  i18n: add a missing space in message
diff --git a/sequencer.c b/sequencer.c
@@ -2558,7 +2558,7 @@ static enum check_level get_missing_commit_check_level(void)
 		return CHECK_WARN;
 	if (!strcasecmp("error", value))
 		return CHECK_ERROR;
-	warning(_("unrecognized setting %s for option"
+	warning(_("unrecognized setting %s for option "
 		  "rebase.missingCommitsCheck. Ignoring."), value);
 	return CHECK_IGNORE;
 }

Original file line number	Diff line number	Diff line change
`@@ -2558,7 +2558,7 @@ static enum check_level get_missing_commit_check_level(void)`
`2558`	`2558`	`return CHECK_WARN;`
`2559`	`2559`	`if (!strcasecmp("error", value))`
`2560`	`2560`	`return CHECK_ERROR;`
`2561`		`- warning(_("unrecognized setting %s for option"`
	`2561`	`+ warning(_("unrecognized setting %s for option "`
`2562`	`2562`	`"rebase.missingCommitsCheck. Ignoring."), value);`
`2563`	`2563`	`return CHECK_IGNORE;`
`2564`	`2564`	`}`