Re: Avoiding the three-windows merging with Git

[Eli Zaretskii]

> From: Richard Stallman <address@hidden>
> Cc: address@hidden, address@hidden
> Date: Wed, 27 Nov 2019 01:45:50 -0500
> 
>   > Attached is a silly script to create a conflict on a temporary
>   > repository.  The script creates 3 folders in the current directory:
> 
> Does it operate purely locally?  No connection to any remote site?

Yes, it arranges for the upstream repository to be on your local
machine, just in another directory.