Skip to content

Commit

Permalink
Merge branch 'ja/diff-opt-typofix'
Browse files Browse the repository at this point in the history
Typofix.

* ja/diff-opt-typofix:
  diff: fix mistake in translatable strings
  • Loading branch information
gitster committed May 30, 2019
2 parents 0e5387c + 8bcd8f4 commit 936dce6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 936dce6

Please sign in to comment.