From: Stefan Sperling <stsp@stsp.name>
Subject: Re: show original content in merge conflicts
To: Sebastien Marie <semarie@online.fr>
Cc: gameoftrees@openbsd.org
Date: Fri, 11 Oct 2019 12:29:04 +0200

On Fri, Oct 11, 2019 at 11:12:09AM +0200, Sebastien Marie wrote:
> Do you think it would be valuable to expand it more than just the commit id,
> with terms like "workdir", "base" or "commit" ? or does it would just add
> confusion for others people or eventually some tools ?
> 
>   <<<<<<< commit 1234....
>   content of new file in repository
>   ||||||| base 1235....
>   content of original file in repository
>   ======= workdir
>   content of locally modified file
>   >>>>>>>

Yes, I agree that improving the labels like this would be nice.
I will try to work on that soon.