SIGN IN SIGN UP

Disable merge-conflict commands for 3wm-editor (#161304)

fixes https://github.com/microsoft/vscode/issues/159156
J
Johannes Rieken committed
c1b80f6402b60b1dda217d85d109cede171f68c0
Parent: ba7d262
Committed by GitHub <[email protected]> on 9/20/2022, 11:50:21 AM