mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
225bc32a98
commit
51b04c05b7
|
@ -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`")),
|
||||
|
|
Loading…
Reference in a new issue