Re: [PATCH v2 03/10] sequencer: be more careful with external merge

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 15, 2026, 18:53 UTC
Message-ID: <xmqqo6g8m6da.fsf@gitster.g>
In-Reply-To: <6cdccc2b-c0b4-497f-8408-a18bd0981505@gmail.com>

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

Show 16 quoted lines

> On 15/07/2026 10:35, Phillip Wood wrote:
>> Hi Oswald
>> 
>> On 13/07/2026 15:01, Oswald Buddenhagen wrote:
>>> On Mon, Jul 13, 2026 at 02:17:20PM +0100, Phillip Wood wrote:
>>>> If an external merge strategy cannot merge (for example because it
>>>> would overwrite an untracked file) it exits with a non-zero exit
>>>> code other than 1. This should be treated differently to a merge
>>>>
>>> s/to/from/, i think?
>> 
>> Both are valid - the internet tells be "different to" is more common it 
>
> sigh s/be/me/
>
> Phillip

sigh s/it/in/ ;-)

>
>> British English, whereas "different from" is more common in American 
>> English. I guess for an international audience "from" would be the 
>> better choice.