development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 10:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove merge keyboard shortcuts (fixes #28376)

Browse source
This commit is contained in:
Christof Marti 2017-06-26 11:25:46 -07:00
parent a46b03b702
commit 1de69f4d8d
1 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
extensions/merge-conflict/package.json
View file

@ -67,38 +67,6 @@
"command": "merge-conflict.compare"
}
],
"keybindings": [
{
"command": "merge-conflict.next",
"when": "editorTextFocus",
"key": "alt+m down"
},
{
"command": "merge-conflict.previous",
"when": "editorTextFocus",
"key": "alt+m up"
},
{
"command": "merge-conflict.accept.selection",
"when": "editorTextFocus",
"key": "alt+m enter"
},
{
"command": "merge-conflict.accept.current",
"when": "editorTextFocus",
"key": "alt+m 1"
},
{
"command": "merge-conflict.accept.incoming",
"when": "editorTextFocus",
"key": "alt+m 2"
},
{
"command": "merge-conflict.accept.both",
"when": "editorTextFocus",
"key": "alt+m 3"
}
],
"configuration": {
"title": "%config.title%",
"properties": {