Phillip Wood [off-list ref] writes:

On 15/07/2026 10:35, Phillip Wood wrote:

quoted

Hi Oswald

On 13/07/2026 15:01, Oswald Buddenhagen wrote:

quoted

On Mon, Jul 13, 2026 at 02:17:20PM +0100, Phillip Wood wrote:

quoted

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/ ;-)

quoted

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