提交 51373ec4 编写于 作者: B Benjamin Pasero

files - proper URI usage

上级 ee27818f
......@@ -248,7 +248,7 @@ class ResolveSaveConflictAction extends Action {
return this.editorService.openEditor(
{
leftResource: URI.from({ scheme: CONFLICT_RESOLUTION_SCHEME, path: resource.fsPath }),
leftResource: resource.with({ scheme: CONFLICT_RESOLUTION_SCHEME }),
rightResource: resource,
label: editorLabel,
options: { pinned: true }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册