From: Fernando Ramos <greenfoo@u92.eu>
Date: Sun, 27 Mar 2022 22:17:49 GMT
Subject: Re: [PATCH v6 3/3] vimdiff: add tool documentation
Message-ID: <YkDijfPgoiVObrFD@zacax395.localdomain>
In-Reply-To: <xmqqmthb5aw8.fsf@gitster.g>

> Are you signalling the above part that it is (or isn't) included in
> git-mergetool.txt by defining
> 
> 	:git-mergetool: 1
> 
> before the piece gets included with
> 
> 	include::config/mergetool.txt
> 
> See for example how git-rev-list.txt tweaks what gets included from
> rev-list-description.txt by doing:
> 
>     'git rev-list' [<options>] <commit>... [[--] <path>...]
> 
>     DESCRIPTION
>     -----------
> 
>     :git-rev-list: 1
>     include::rev-list-description.txt[]
> 
>     'rev-list' is a very essential Git command, since it
> 

Thanks for the hint. It is now working as expected. I'll include the fix in v7
together with the other fixes that prevent `git apply` from executing cleanly.