development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Johannes Rieken c1b80f6402
Disable merge-conflict commands for 3wm-editor (#161304) 
fixes https://github.com/microsoft/vscode/issues/159156
2022-09-20 13:50:21 +02:00
..
media Add icons for built-in extensions (fixes #81760) 2021-04-20 12:09:24 -07:00
src Enable conflict marker decorators even if merge editor is enabled. (#157982) 2022-08-12 15:21:38 +02:00
.vscodeignore Do not ship unnecessary files with extensions 2020-07-24 13:57:51 +02:00
extension-browser.webpack.config.js used shared webpack-config for browser 2020-06-25 23:22:02 +02:00
extension.webpack.config.js make merge-conflic serverless 2020-06-12 11:03:52 +02:00
package.json Disable merge-conflict commands for 3wm-editor (#161304) 2022-09-20 13:50:21 +02:00
package.nls.json CodeLens should be one word 2020-04-03 13:46:00 -07:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
tsconfig.json use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files 2021-11-09 15:53:35 +01:00
yarn.lock Rev built-in versions of vscode-nls to 5.1.0 (#157530) 2022-08-08 18:43:45 +02:00

README.md

Merge Conflict

Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.

Features

See Merge Conflicts in VS Code to learn about features of this extension.