Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 15:01:57 +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

4
extensions/merge-conflict/package.nls.json
View File

@@ -12,8 +12,10 @@
"command.next": "Next Conflict",
"command.previous": "Previous Conflict",
"command.compare": "Compare Current Conflict",
"command.compareAll": "Compare All Conflict in Current Editor",
"config.title": "Merge Conflict",
"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor."
"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
"config.diffViewContext": "Controls how many unchanged lines around the merge conflict should be displayed in the diff view."
}