What happened
A developer building a merge tool replayed 132 conflicted merges from their own repository and found that 81 of them touched the same test file. On those 81, the tool’s Accept Both button gave the right answer six times.
Why it happened
Git’s default conflict style lifts the closing brace both sides share to below the markers and writes it once, so joining the two sides as written left the first function open.
How it ended
The fix merged the next day in pull request #1859, which closed the issue on 19 October.
