From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 09 Mar 2024 19:56:16 GMT
Subject: Re: [PATCH] sequencer: allow disabling conflict advice
Message-ID: <xmqqh6hfch7j.fsf@gitster.g>
In-Reply-To: <b52a8678-a13f-455b-a817-2df2b4fab795@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

>> Maybe just 'advice.mergeConflict' ?
>
> 'advice.mergeConflict' sounds good to me

Yup, looks good to me, too.