What I frequently have trouble with is knowing what is represented by “theirs” and “ours”. I wish it would just tell me the branch name instead because sometimes both commits are logically “ours” or “theirs”.

Obviously that would only work for ‘git merge branch’ scenarios and the like but it’d be great.