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

add git.experimental.mergeEditor setting to enable/disable merge editor for conflicting files

Browse Source
This commit is contained in:
Johannes
2022-05-25 17:08:15 +02:00
parent 1ed660b17e
commit 38931b6a3d
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/git/package.nls.json
View File

@@ -236,6 +236,7 @@
"config.logLevel.error": "Log only error, and critical information",
"config.logLevel.critical": "Log only critical information",
"config.logLevel.off": "Log nothing",
"config.experimental.mergeEditor": "Open the _experimental_ merge editor for files that are currently under conflict.",
"submenu.explorer": "Git",
"submenu.commit": "Commit",
"submenu.commit.amend": "Amend",