{"thread":{"id":"56514","subject":"[PATCH] difftool: word spacing fix","startedAt":"2021-09-16T11:40:19Z","lastAt":"2021-09-16T11:40:19Z","messageCount":1,"participants":["Bagas Sanjaya"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"436114","messageId":"20210916113934.77097-1-bagasdotme@gmail.com","threadId":"56514","inReplyTo":null,"subject":"[PATCH] difftool: word spacing fix","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-09-16T11:39:35Z","receivedAt":"2021-09-16T11:40:19Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"  - s/non - zero/non-zero/\n  - add space between diff formats/mode and option parentheses\n\nSigned-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n---\n builtin/difftool.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/difftool.c b/builtin/difftool.c\nindex 6a9242a803..ad9187761e 100644\n--- a/builtin/difftool.c\n+++ b/builtin/difftool.c\n@@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,\n \t\tconst char *src_path, *dst_path;\n \n \t\tif (starts_with(info.buf, \"::\"))\n-\t\t\tdie(N_(\"combined diff formats('-c' and '--cc') are \"\n+\t\t\tdie(N_(\"combined diff formats ('-c' and '--cc') are \"\n \t\t\t       \"not supported in\\n\"\n-\t\t\t       \"directory diff mode('-d' and '--dir-diff').\"));\n+\t\t\t       \"directory diff mode ('-d' and '--dir-diff').\"));\n \n \t\tif (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,\n \t\t\t\t     &status))\n@@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)\n \t\t\t    \"`--tool`\")),\n \t\tOPT_BOOL(0, \"trust-exit-code\", &trust_exit_code,\n \t\t\t N_(\"make 'git-difftool' exit when an invoked diff \"\n-\t\t\t    \"tool returns a non - zero exit code\")),\n+\t\t\t    \"tool returns a non-zero exit code\")),\n \t\tOPT_STRING('x', \"extcmd\", &extcmd, N_(\"command\"),\n \t\t\t   N_(\"specify a custom command for viewing diffs\")),\n \t\tOPT_ARGUMENT(\"no-index\", &no_index, N_(\"passed to `diff`\")),\n\nbase-commit: 4c719308ce59dc70e606f910f40801f2c6051b24\n-- \n2.25.1\n\n"}]}