VcView: add missing cases from temp file extension commit
Missing cases from commit: VcView: use extension with temp files so syntax highlight correct (#459 (closed))
- file in git repo with conflict status didn't preserve the extension for the base file, so may get incorrect language
- null vc