Make mine/theirs assume current branch name