It's really confusing - why are only lines 134-148 visible? Is there some option I accidentally enabled that hides code that has not changed? I tried to update to the latest version (2.16.8.0) but the about box still says 2.16.4.0 even after running the installer and restarting the app... What's really weird is before I copy the code over, the middle pane is completely blank, even though I have the option to perform an initial merge on startup enabled, and pressing F5 to refresh does not help... And I used to be able to actually save the file properly after doing this, but now the merge process actually deletes all the code that is hidden! Good thing I checked before creating my pull request! Could this have something to do with character encodings? I noticed the previous version of the file was Unicode (UTF-8) while the merged version is Western European (Windows)... Well, I had three files that broke in this way out of seven conflicts that I merged, and one of them had the character encoding issue...
