development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
vscode/extensions/merge-conflict
History
Robo bce4d71f64
chore: bump node@14.x in devDependencies (#122905)
2021-05-04 10:04:13 +02:00
..
media Add icons for built-in extensions (fixes #81760) 2021-04-20 12:09:24 -07:00
src Adds code lens on vfs files 2021-04-22 03:29:20 -04: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 chore: bump node@14.x in devDependencies (#122905) 2021-05-04 10:04:13 +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 more standard name for shared extension tsconfig 2021-04-12 15:58:38 -07:00
yarn.lock chore: bump node@14.x in devDependencies (#122905) 2021-05-04 10:04:13 +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.