Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +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

22
extensions/git/package.json
View File

@@ -609,6 +609,18 @@
"command": "git.openMergeEditor",
"title": "%command.git.openMergeEditor%",
"category": "Git"
},
{
"command": "git.runGitMerge",
"title": "%command.git.runGitMerge%",
"category": "Git",
"enablement": "isMergeEditor"
},
{
"command": "git.runGitMergeDiff3",
"title": "%command.git.runGitMergeDiff3%",
"category": "Git",
"enablement": "isMergeEditor"
}
],
"keybindings": [
@@ -1568,6 +1580,16 @@
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges"
}
],
"mergeEditor/result/context": [
{
"command": "git.runGitMerge",
"when": "isMergeEditor"
},
{
"command": "git.runGitMergeDiff3",
"when": "isMergeEditor"
}
],
"scm/change/title": [
{
"command": "git.stageChange",