From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Wed, 25 Sep 2019 06:33:25 GMT
Subject: Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
Message-ID: <CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m=h85KUCmBCFCdvw@mail.gmail.com>
In-Reply-To: <7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email>

Pratyush,

once again, I had done this years ago. I may post an updated patch in
the evening:

https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b

Bert

On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:
>
> Hi list,
> cc Pratyush,
>
> [resend without attached png file]
>
> While rebasing an old series, I had a 3-way merge fall back that didn't
> show the `||||||| merged common ancestors` very well in git-gui.
>
> That is, the conflict markers, and common ancestor lines, are treated as
> being part of the current HEAD hunk, rather than being separated.
>
> I opened a Git for Windows issue
> https://github.com/git-for-windows/git/issues/2340 which has the
> screenshot of the git-gui markers.
>
> I've not had any chance to look at the underlying code, but thought it
> worth reporting. I guess the issue has been there a while.
>
> Philip
>
>
>