From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 May 2019 17:50:46 +0000 (-0700)
Subject: Merge branch 'ja/diff-opt-typofix'
X-Git-Tag: v2.22.0-rc2~3
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/936dce6f9358afd935cc73c27be7509c07222852?hp=0e5387cd02482a0b7d42e78900cf3c0b13a39ee2

Merge branch 'ja/diff-opt-typofix'

Typofix.

* ja/diff-opt-typofix:
diff: fix mistake in translatable strings
---

diff --git a/diff.c b/diff.c
index 80ddc11671..2068b1c06e 100644
--- a/diff.c
+++ b/diff.c
@@ -5455,13 +5455,13 @@ static void prep_parse_options(struct diff_options *options)
 			       N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
 			       PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
 		OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
-			       N_("move lines of code are colored differently"),
+			       N_("moved lines of code are colored differently"),
 			       PARSE_OPT_OPTARG, diff_opt_color_moved),
 		OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
 			       N_("how white spaces are ignored in --color-moved"),
 			       0, diff_opt_color_moved_ws),
 
-		OPT_GROUP(N_("Diff other options")),
+		OPT_GROUP(N_("Other diff options")),
 		OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
 			       N_("when run from subdir, exclude changes outside and show relative paths"),
 			       PARSE_OPT_NONEG | PARSE_OPT_OPTARG,