[Bug] Merge conflict tool not opening for deleted files

[redsigma]

After i tried to press the Open all conflicts in external merge tool button, as shown below

The below popup window showed up

Something i noticed is that it asks me at the bottom if i want to use modified or abort, but there is no way for me to type in that window.

Also it did generate the BASE, BACKUP, LOCAL, REMOTE files, but the merge tool didnt open. And on the right window (below screenshot) the open in merge tool button is missing

I am using vscode as the merge tool and it works fine when i open it from the diffs window on the right.

[love-linger]

If conflict reason are not Both added or Both modified, user can only resolve it by using mine/theirs. I'll pull a commit that does not try to use external merge editor for those conflicts.

[love-linger]

#1365

[love-linger]

I'll pull a commit that does not try to use external merge editor for those conflicts.

Sorry. After checking the code, I think there's nothing to do with SourceGit. When the Open all conflicts in external merge tool button is clicked, SourceGit just call git mergetool command without any files. It means that the external merge tool is opened by git for each conflicted file.