All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] difftool: word spacing fix
@ 2021-09-16 11:39 Bagas Sanjaya
  0 siblings, 0 replies; only message in thread
From: Bagas Sanjaya @ 2021-09-16 11:39 UTC (permalink / raw)
  To: git; +Cc: Johannes Schindelin, Bagas Sanjaya

  - s/non - zero/non-zero/
  - add space between diff formats/mode and option parentheses

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
 builtin/difftool.c | 6 +++---
 1 file 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`")),

base-commit: 4c719308ce59dc70e606f910f40801f2c6051b24
-- 
2.25.1


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-09-16 11:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 11:39 [PATCH] difftool: word spacing fix Bagas Sanjaya

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.