diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 20:50:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 20:50:46 +0300 |
| commit | 936dce6f9358afd935cc73c27be7509c07222852 (patch) | |
| tree | b32ddcf65987f303b55c1f5b2f42d57726e4f0cd /diff.c | |
| parent | 0e5387cd02482a0b7d42e78900cf3c0b13a39ee2 (diff) | |
| parent | 8bcd8f4cea9d819da690a545d65dd562409d633a (diff) | |
Merge branch 'ja/diff-opt-typofix'
Typofix.
* ja/diff-opt-typofix:
diff: fix mistake in translatable strings
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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, |