If there is a conflict with a deleted file during a merge, vscode won't display a diff for that file. Instead the last version of the file before being deleted is shown as readonly.

With this it's hard to see the changes that were made on the file before (or after) it was deleted.

With git you can see those changes using a commande like

git diff ...incoming_merge_branch -- rel_path_deleted_file
or
git diff incoming_merge_branch... -- rel_path_deleted_file

Depending if the conflict is a "deleted by us" or "deleted by them".

Would it be possible for vscode to use this command when a displaying a conflict for a deleted file ?
It would greatly help the merge process I think.

For the time being I configured vscode to be my difftool so I can write this command and display the diff in vscode.

git difftool ...incoming_merge_branch -- rel_path_deleted_file

But still, if I could not have to write the commande it'll be easier.