Crash fixed when selecting a file with no base in the "Resolve merge conflicts" dialog. Closes #2463