We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 862149d commit 0b5aad3Copy full SHA for 0b5aad3
src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
@@ -333,18 +333,19 @@ export class MergeConflictGutterItemView extends Disposable implements IGutterIt
333
}
334
335
if (e.button === /* Right */ 2) {
336
+ e.stopPropagation();
337
+ e.preventDefault();
338
+
339
contextMenuService.showContextMenu({
340
getAnchor: () => checkBox.domNode,
341
getActions: item.getContextMenuActions,
342
});
343
- e.stopPropagation();
- e.preventDefault();
344
} else if (e.button === /* Middle */ 1) {
- item.toggleBothSides();
345
-
346
e.stopPropagation();
347
e.preventDefault();
348
+ item.toggleBothSides();
349
350
})
351
);
0 commit comments