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

On Fri, Oct 11, 2019 at 10:31:15AM +0200, Stefan Sperling wrote:
> On Wed, Oct 09, 2019 at 12:25:23PM +0200, Stefan Sperling wrote:
> > This diff makes conflict markers include the original group of lines
> > which were changed in conflicting ways in two derived versions of the
> > same file.
> 
> I have not yet heard any feedback regarding this change.
> Is nobody interested in this? Should I drop this change or go ahead?
> 

Usually, I am unconfortable with such output: I can't remember what is the
version in each part (current workdir / current base commit / "new" commit).

Whereas with only two parts (workdir/"new") I am able to recognize what is
workdir and what is "new" without too much trouble.

But it doesn't mean it shouldn't be done, specially as you said you will add
commit reference too.

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
  >>>>>>>

But I am just asking. Feel free to commit it as it.

Thanks.
-- 
Sebastien Marie