Skip to content

Commit 0b5aad3

Browse files
authored
1 parent 862149d commit 0b5aad3

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,18 +333,19 @@ export class MergeConflictGutterItemView extends Disposable implements IGutterIt
333333
}
334334

335335
if (e.button === /* Right */ 2) {
336+
e.stopPropagation();
337+
e.preventDefault();
338+
336339
contextMenuService.showContextMenu({
337340
getAnchor: () => checkBox.domNode,
338341
getActions: item.getContextMenuActions,
339342
});
340343

341-
e.stopPropagation();
342-
e.preventDefault();
343344
} else if (e.button === /* Middle */ 1) {
344-
item.toggleBothSides();
345-
346345
e.stopPropagation();
347346
e.preventDefault();
347+
348+
item.toggleBothSides();
348349
}
349350
})
350351
);

0 commit comments

Comments
 (0)