Why do merge tools pretend that "their" and "our" or "remote" and "local" are good labels? Can they not show the commit message and hash? Nowadays with history editing often both sides are local and mine.
And, on the command-line at least, "theirs" and "ours" are reversed (only) for "rebase" [1] so that means, at least for me, I have to mentally ask myself "are theirs/ours reversed for this command?" for every command I execute, they might as well be called "foo" and "bar" at this point for me.
I did see the screenshots. That's what triggered my comment. I did not see any branch names. Now I see "nh-scroll-fix" and "origin/fix-simulate-na..." in the conflict dialog, but not in the merge dialog. Branch names seem insufficient anyway though, but it would be a slight improvement I guess.
[1] https://git-scm.com/docs/git-rebase#Documentation/git-rebase...