source control tab not showing merge conflict files

[aleksandarbos]

• VSCode Version: 1.52.1 (user setup)
• OS Version: OS: Windows_NT x64 10.0.18363

Version: 1.52.1 (user setup)
Commit: ea3859d4ba2f3e577a159bc91e3074c5d85c0523
Date: 2020-12-16T16:34:46.910Z
Electron: 9.3.5
Chrome: 83.0.4103.122
Node.js: 12.14.1
V8: 8.3.110.13-electron.0
OS: Windows_NT x64 10.0.18363

Steps to Reproduce:

1. initialize merging with some branch that has some conflicting docx files:
   added by them: print/templates/supplement.docx
2. expected: VS code should be showing all conflicting and modified files within the source control tab like:
3. actual:
   

there's workaround, if the print/templates/supplement.docx file gets staged by:
git add print/templates/supplement.docx then files are properly displayed within source control tab.

what might be also interesting is that there were no issues when other binary files like png were modified. not quite sure what might go wrong :/

Does this issue occur when all extensions are disabled?: Yes

[vscodebot]

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• Git merge conflict no detecting (#114397)
• Can't use default commit message when merge conflicts (#110316)

[FeldmannJR]

This just occurred to me as well, in my case i don't have any .docx in the repository, just javascript source files.

[aleksandarbos]

This just occurred to me as well, in my case i don't have any .docx in the repository, just javascript source files.

@FeldmannJR have you tried to reproduce the bug by having all extensions disabled?

[FeldmannJR]

Yes,
Just enabled WSL support.

[eamodio]

Duplicate of #112537