From: Junio C Hamano Date: Mon, 27 Aug 2018 21:33:51 +0000 (-0700) Subject: Merge branch 'js/range-diff' X-Git-Tag: v2.19.0-rc1~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6201d755b9b51e70cfa8a050970d29fc379e607c?hp=926107db6dfba9e1b64dd2ab5f2e1d078acd1009 Merge branch 'js/range-diff' Finishing touched to help string. * js/range-diff: range-diff: update stale summary of --no-dual-color --- diff --git a/builtin/range-diff.c b/builtin/range-diff.c index f52d45d9d6..0aa9bed41f 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -25,7 +25,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) OPT_INTEGER(0, "creation-factor", &creation_factor, N_("Percentage by which creation is weighted")), OPT_BOOL(0, "no-dual-color", &simple_color, - N_("color both diff and diff-between-diffs")), + N_("use simple diff colors")), OPT_END() }; int i, j, res = 0;