A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch ...

DiffMerge was getting killed on my mac. It turns out a hacky fix (martinsson@01dc6ea) will to the job. I'd be happy if someone had a better grasp of why this is so. But if we don't understand perhaps ...