Diff Markers seen during fork merge when merge.conflictstyle set to diff3

[eileenh]

Prerequisite:
git merge.conflictstyle set to diff3

For example, run
git config --global merge.conflictstyle diff3

(Issue does not repro if merge.conflictstyle is set to default value of merge)

Repro steps:

1. Clone https://github.com/eileenh/eileenh-fork-test
2. Open the repository in fork application
3. Switch to branch-b
4. Merge branch-a into branch-b (I right-clicked on branch-a, used "merge into branch-b" menu option
   
5. Get merge conflict notification
   
6. Click Merge
7. Now I am on this screen
   
8. Click the Merge button

Result:
The merge conflict window contains diff marker "||||||| 8763021" on the branch-b side

After clicking Select Right, the merged file looks like this:

Note that these changes actually get pushed into the file if you click the Merge button in this window

Expect:
Diff markers should not be present in merged text

I am on Windows Fork version 1.74.1.0

[eileenh]

I swear this either used to work, or maybe it works on the mac version, since I haven't seen this issue before and I use diff3 all the time

[DanPristupov]

It works on Mac, I think

[DanPristupov]

Fixed in 1.77