diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:22 (GMT) |
| commit | 706b0b5e8d683b06e99bdfb2349228b360e4cf03 (patch) | |
| tree | 6f1f5a53673bd1d33bd43ae2552df5ed965ffc34 /diff.c | |
| parent | 1ba2fc603f4aa564e029843589ca0b36a8aed4fc (diff) | |
| parent | e3f2f5f9cd9238ae106434278d325eada2719842 (diff) | |
| download | git-706b0b5e8d683b06e99bdfb2349228b360e4cf03.zip git-706b0b5e8d683b06e99bdfb2349228b360e4cf03.tar.gz git-706b0b5e8d683b06e99bdfb2349228b360e4cf03.tar.bz2 | |
Merge branch 'es/diff-color-moved-fix'
One of the "diff --color-moved" mode "dimmed_zebra" that was named
in an unusual way has been deprecated and replaced by
"dimmed-zebra".
* es/diff-color-moved-fix:
diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -271,10 +271,12 @@ static int parse_color_moved(const char *arg) return COLOR_MOVED_ZEBRA; else if (!strcmp(arg, "default")) return COLOR_MOVED_DEFAULT; + else if (!strcmp(arg, "dimmed-zebra")) + return COLOR_MOVED_ZEBRA_DIM; else if (!strcmp(arg, "dimmed_zebra")) return COLOR_MOVED_ZEBRA_DIM; else - return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra', 'plain'")); + return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'")); } static int parse_color_moved_ws(const char *arg) |