diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-03 21:49:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-03 21:49:21 -0700 |
| commit | 09bde81f29f72b207260cb0fa27e751b65cd6de2 (patch) | |
| tree | a13687b6099a69035638c62091e1edc1c91bccb5 /builtin/difftool.c | |
| parent | Merge branch 'rs/close-pack-leakfix' (diff) | |
| parent | difftool: fix word spacing in the usage strings (diff) | |
| download | tgif-09bde81f29f72b207260cb0fa27e751b65cd6de2.tar.xz | |
Merge branch 'bs/difftool-msg-tweak'
Message tweak.
* bs/difftool-msg-tweak:
difftool: fix word spacing in the usage strings
Diffstat (limited to 'builtin/difftool.c')
| -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 21e055d13a..210da03908 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -405,9 +405,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)) @@ -708,7 +708,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_BOOL(0, "no-index", &no_index, N_("passed to `diff`")), |