From: Sergey Organov <sorganov@gmail.com>
Date: Fri, 06 Oct 2023 18:42:55 GMT
Subject: Re: [PATCH v3 1/3] diff-merges: improve --diff-merges documentation
Message-ID: <871qe7r3rk.fsf@osv.gnss.ru>
In-Reply-To: <xmqq34yog3ux.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

> Sergey Organov <sorganov@gmail.com> writes:

[...]

>> +on, m::
>> +	Make diff output for merge commits to be shown in the default
>> +	format. The default format could be changed using
>>  	`log.diffMerges` configuration parameter, which default value
>>  	is `separate`.
>
> The original is already wrong so these are not problems this patch
> introduces, but
>
>  - "configuration variable" is how we refer to these entities.
>  - "which default value" -> "whose default value".

Added this amendment to the patch.

Thanks,
-- Sergey Organov