[XorNot]

Man do I hate this behavior because it would be really some by just using the branch names rather then "ours" and "theirs"

[Sharlin]

Agreed. Even when the branch is the same, it would always be distinguishable by <remote-name>/<branch-name> vs. just <branch-name>.