Merge conflict in file outside of subproject results in empty file on one side of diff
Created originally on Bitbucket by greenrd (Robin Green)
I have a repository containing two sbt subprojects, each of which are an Eclipse project. There is a file project/Build.scala which lives outside either of the Eclipse projects, in the repository. When I do a merge resulting in a merge conflict in that file, and double-click on the merge conflict in that file, I get a graphical diff between an empty file and one version of the file, instead of a diff between the two versions of the file.