Merge branch 'bs/difftool-msg-tweak'

Message tweak.

* bs/difftool-msg-tweak:
  difftool: fix word spacing in the usage strings

diff --cc builtin/difftool.c
index 21e055d13a0a65698743228d7de6edb78a28cda9,ad9187761eecfb9e5d696574d8a66d2e3bed4110..210da03908c7ccd1cb041d8c3af7c09ba3c0baed
--- 1/builtin/difftool.c
--- 2/builtin/difftool.c
+++ b/builtin/difftool.c
@@@ -708,13 -713,12 +708,13 @@@ int cmd_difftool(int argc, const char *
                            "`--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`")),
 +              OPT_BOOL(0, "no-index", &no_index, N_("passed to `diff`")),
                OPT_END()
        };
 +      struct child_process child = CHILD_PROCESS_INIT;
  
        git_config(difftool_config, NULL);
        symlinks = has_symlinks;