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

Implements commands to recompute merge with git merge-file

Browse Source
This commit is contained in:
Henning Dieterichs
2022-08-26 12:01:47 +02:00
parent 16536c25a1
commit 7688a40249
5 changed files with 92 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,8 @@
"command.api.getRemoteSources": "Get Remote Sources",
"command.git.acceptMerge": "Accept Merge",
"command.git.openMergeEditor": "Open in Merge Editor",
"command.git.runGitMerge": "Compute Conflicts With Git",
"command.git.runGitMergeDiff3": "Compute Conflicts With Git (Diff3)",
"config.enabled": "Whether git is enabled.",
"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows). This can also be an array of string values containing multiple paths to look up.",
"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",