difftool: fix word spacing in the usage strings
Remove spaces in `non - zero` and add a space between the diff format/mode and option parentheses in difftool's usage strings. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Bagas Sanjaya committed
Sep 21, 2021 at 18:17 UTC
51b04c05b7ab624db6751fe29e271864312b017a
1 file changed
+3
-3
builtin/difftool.c
+3
-3
@@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
410
const char *src_path, *dst_path;
411
412
if (starts_with(info.buf, "::"))
413
- die(N_("combined diff formats('-c' and '--cc') are "
413
+ die(N_("combined diff formats ('-c' and '--cc') are "
414
"not supported in\n"
415
- "directory diff mode('-d' and '--dir-diff')."));
415
+ "directory diff mode ('-d' and '--dir-diff')."));
416
417
if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
418
&status))
@@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
713
"`--tool`")),
714
OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
715
N_("make 'git-difftool' exit when an invoked diff "
716
- "tool returns a non - zero exit code")),
716
+ "tool returns a non-zero exit code")),
717
OPT_STRING('x', "extcmd", &extcmd, N_("command"),
718
N_("specify a custom command for viewing diffs")),
719
OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),