development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 11:07:22 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Christof Marti f12410309c Remove delay (fixes #62652)
2020-03-27 10:55:17 +01:00
..
resources/icons [ImgBot] Optimize images 2018-11-06 20:46:03 +00:00
src Remove delay (fixes #62652) 2020-03-27 10:55:17 +01:00
.vscodeignore Avoid shipping unnecessary files 2018-09-19 19:53:46 +02:00
extension.webpack.config.js fix webpack entries for merge-conflict and search-rg 2018-09-20 09:59:24 +02:00
package.json debt - bump node.d.ts dependency in extensions to 12.x (part of #82514) 2019-10-28 08:11:47 +01:00
package.nls.json Add enumDescriptions for merge-conflict.diffViewPosition 2019-05-28 14:54:29 -07:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
tsconfig.json Update more extensions to use shared config 2018-10-02 10:24:19 -07:00
yarn.lock debt - bump node.d.ts dependency in extensions to 12.x (part of #82514) 2019-10-28 08:11:47 +01: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.