问题如图所示

解决:
将git:merge editor关了就行
来源:https://stackoverflow.com/questions/67703214/vscode-merge-conflict-options-not-displaying

问题如图所示
解决:
将git:merge editor关了就行
来源:https://stackoverflow.com/questions/67703214/vscode-merge-conflict-options-not-displaying