From: Philip Oakley <philipoakley@iee.email>
Date: Tue, 24 Sep 2019 22:05:26 GMT
Subject: Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
Message-ID: <7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email>
In-Reply-To: <b2f412e2-d95f-0f73-5341-73c19ee2c6f7@iee.email>

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