FileNameCache: accept that events can come with invalid files in them
Handle errors in HgMergeProvider; check that  base revision contains conflict file, if not - return empty content
IDEA-77929 Convert line endings of existing file

Do not reset cached line endings info on every file change. Special utility method has been introduced for that.
Make resize point matching more tolerant

https://partner-android-review.googlesource.com/#/c/30117/6
Make a few key fields protected rather than private

https://partner-android-review.googlesource.com/#/c/30207/4