On 25/09/2019 07:33, Bert Wesarg wrote:
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
Thanks, I'll see if I can look at it (I'd also need to re-prepare my
rerere cache [how to do /that/ ?] and the rebase)
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
