Skip to content

Commit 51b04c0

Browse files
bagasmegitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 225bc32 commit 51b04c0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builtin/difftool.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
410410
const char *src_path, *dst_path;
411411

412412
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 "
414414
"not supported in\n"
415-
"directory diff mode('-d' and '--dir-diff')."));
415+
"directory diff mode ('-d' and '--dir-diff')."));
416416

417417
if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
418418
&status))
@@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
713713
"`--tool`")),
714714
OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
715715
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")),
717717
OPT_STRING('x', "extcmd", &extcmd, N_("command"),
718718
N_("specify a custom command for viewing diffs")),
719719
OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),

0 commit comments

Comments
 (0)