Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show context for diff view of merge conflict and introduce compareAll.

Browse Source
This commit is contained in:
Peng Lyu
2019-05-23 14:19:09 -07:00
parent 7b078e1165
commit fa69b4e7d6
5 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/merge-conflict/package.json
View File

@@ -81,6 +81,12 @@
"title": "%command.compare%",
"original": "Compare Current Conflict",
"command": "merge-conflict.compare"
},
{
"category": "%command.category%",
"title": "%command.compareAll%",
"original": "Compare All Conflict in Current Editor",
"command": "merge-conflict.compareAll"
}
],
"menus": {
@@ -114,6 +120,11 @@
"type": "boolean",
"description": "%config.autoNavigateNextConflictEnabled%",
"default": false
},
"merge-conflict.diffViewContext": {
"type": "number",
"description": "%config.diffViewContext%",
"default": 0
}
}
}