Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff: fix mistake in translatable strings
author
Jean-Noël Avila
<jn.avila@free.fr>
Fri, 17 May 2019 19:26:19 +0000
(21:26 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 19 May 2019 02:01:02 +0000
(11:01 +0900)
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ab15ad1
)
diff --git
a/diff.c
b/diff.c
index 4d3cf83a27e5785f5fd50dd2ce6155c94eb50840..6e87f956450520463f10ab90cda18521e10b3b99 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-5453,13
+5453,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_("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_("move
d
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),
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,
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,