[VersionControl] Actually show ignored overlay.
VersionStatus.Ignored is not in the LocalChangesMask.
And it is usually paired with VersionStatus.Unversioned, so it must be the first check in the overlay icon getter.
[VersionControl] Remove dead code in MergeView.