diff options
| author |  Bagas Sanjaya <bagasdotme@gmail.com> | 2021-09-21 18:17:13 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-22 17:09:02 -0700 |
| commit | 51b04c05b7ab624db6751fe29e271864312b017a (patch) | |
| tree | 8afb22e5ba6896bcd9d556b50fd2a2484722d9bb | |
| parent | Git 2.33 (diff) | |
| download | tgif-51b04c05b7ab624db6751fe29e271864312b017a.tar.xz | |
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>
| -rw-r--r-- | builtin/difftool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 6a9242a803..ad9187761e 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, const char *src_path, *dst_path; if (starts_with(info.buf, "::")) - die(N_("combined diff formats('-c' and '--cc') are " + die(N_("combined diff formats ('-c' and '--cc') are " "not supported in\n" - "directory diff mode('-d' and '--dir-diff').")); + "directory diff mode ('-d' and '--dir-diff').")); if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid, &status)) @@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix) "`--tool`")), OPT_BOOL(0, "trust-exit-code", &trust_exit_code, N_("make 'git-difftool' exit when an invoked diff " - "tool returns a non - zero exit code")), + "tool returns a non-zero exit code")), OPT_STRING('x', "extcmd", &extcmd, N_("command"), N_("specify a custom command for viewing diffs")), OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")), |