From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Oct 2021 04:49:21 +0000 (-0700)
Subject: Merge branch 'bs/difftool-msg-tweak'
X-Git-Tag: v2.34.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09bde81f29f72b207260cb0fa27e751b65cd6de2;p=thirdparty%2Fgit.git

Merge branch 'bs/difftool-msg-tweak'

Message tweak.

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

09bde81f29f72b207260cb0fa27e751b65cd6de2
diff --cc builtin/difftool.c
index 21e055d13a,ad9187761e..210da03908
--- a/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;