[PATCH] diff: graduate word-diff option from experimental

Pulkit Goyal 7895pulkit at gmail.com
Sun Jul 8 08:59:37 EDT 2018


On Sun, Jul 8, 2018 at 5:56 PM Yuya Nishihara <yuya at tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1531034486 -32400
> #      Sun Jul 08 16:21:26 2018 +0900
> # Node ID be441eb65f09603386f853b1604aae92bca6b53e
> # Parent  f068495a1c28358c22695545ed15a00b54da0d45
> diff: graduate word-diff option from experimental
>
> Per 4.6 Sprint notes.
>
> I've also made it gated by "formatchanging" since it could change the
> output
> if we had an option to highlight words without using colors.
>

​Queued this patch. Many thanks!​

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
> --- a/mercurial/help/config.txt
> +++ b/mercurial/help/config.txt
> @@ -702,6 +702,9 @@ for related options for the annotate com
>  ``unified``
>      Number of lines of context to show.
>
> +``word-diff``
> +    Highlight changed words.
> +
>

​TBH, I am not fan of documenting config options in `hg help config`.
Rather we should document this in commands' help text where it is
applicable so that this is more discoverable.​
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20180708/30c04b19/attachment.html>


More information about the Mercurial-devel mailing list