Re: [PATCH v9 3/4] vimdiff: add tool documentation

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Apr 3, 2022, 20:02 UTC
Message-ID: <d01710e1-8a42-e4d1-5034-f6796372587e@gmail.com>
In-Reply-To: <20220330191909.294610-4-greenfoo@u92.eu>

Hi Fernando,

Le 2022-03-30 à 15:19, Fernando Ramos a écrit :

Show 15 quoted lines

> Running 'git {merge,diff}tool --tool-help' now also prints usage
> information about the vimdiff tool (and its variants) instead of just
> its name.
> 
> Two new functions ('diff_cmd_help()' and 'merge_cmd_help()') have been
> added to the set of functions that each merge tool (ie. scripts found
> inside "mergetools/") can overwrite to provided tool specific
> information.
> 
> Right now, only 'mergetools/vimdiff' implements these functions, but
> other tools are encouraged to do so in the future, specially if they
> take configuration options not explained anywhere else (as it is the
> case with the 'vimdiff' tool and the new 'layout' option)
> 
> Note that the function 'show_tool_names', used in the implmentation of

typo here: implementation (by bad!)

Maybe Junio will correct it before merging to next ?

Philippe.