The 3 way merge editor actually shows the branch name!