title: info.plist merge not showing conflicts
body: <p>im trying to merge the main branch into my personal development branch in Xcode. When I do this (for reference), I'm going to the top, switching to the main development branch, then selecting "Merge Into..." and selecting my development branch (blaine_dev). After doing so, it pulls up its normal conflict resolution window and shows all the conflicted files. It's showing the info.plist file as conflicted. When I click the file to resolve conflicts, it shows the development file on the right, but the file on the left is totally blank. it just says "No Editor". Clicking around doesn't do anything at all. When I hit "cancel", for a split second, it reveals both files. then it closes. I'm not sure how to handle this issue. and for reference, going to the command line and trying to merge with git mergetool just shows info.plist as unchanged and unconflicted. although it probably is different than the other because we have a build script that increments the version every time the app is built.</p>
  
  <p>1 more thing. i tried to simply copy and paste one file into the other to resolve conflicts and it didnt change anything. the results are the same.</p>
  
  <p><img src="https://i.stack.imgur.com/WNGPg.png" alt="screenshot of the problem"></p>
  
  <p>any suggestions? im on a deadline </p>