Re: What's cooking in git.git (Oct 2019, #06; Thu, 24)

From: Denton Liu <liu.denton@gmail.com>
Date: Oct 29, 2019, 08:45 UTC
Message-ID: <20191029084500.GA1579611@generichostname>
In-Reply-To: <xmqqd0emfzrv.fsf@gitster-ct.c.googlers.com>

Hi Junio,

Since you use these What's Cooking messages to generate your release notes:

On Thu, Oct 24, 2019 at 03:01:08PM +0900, Junio C Hamano wrote:

Show 9 quoted lines

> * dl/apply-3way-diff3 (2019-10-24) 5 commits
>   (merged to 'next' on 2019-10-24 at 84e27d28b6)
>  + apply: respect merge.conflictStyle in --3way
>  + t4108: demonstrate bug in apply
>  + t4108: use `test_config` instead of `git config`
>  + t4108: remove git command upstream of pipe
>  + t4108: replace create_file with test_write_lines
> 
>  "git apply --3way" learned to honor merge.conflictsStyle

s/conflictsStyle/conflictStyle/

Thanks,

Denton

>  configuration variable, like merges would.
> 
>  Will cook in 'next'.