This pull request implements a command for opening merge conflicts in VSCode's 3-way merge editor.
Currently, this editor is only used by the git extension and the command is technically private (_open.mergeEditor). However, it works and does the same thing that code -m does on the command line.
If you have a merge conflict and you click it in the list of changes, it will now open this merge editor instead of just opening the file.
It looks like there was a bunch of outdated stuff causing test failures. I went ahead and resolved all of those issues so that the required checks can pass.
This pull request implements a command for opening merge conflicts in VSCode's 3-way merge editor.
Currently, this editor is only used by the git extension and the command is technically private (
_open.mergeEditor
). However, it works and does the same thing thatcode -m
does on the command line.If you have a merge conflict and you click it in the list of changes, it will now open this merge editor instead of just opening the file.