development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-31 11:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity
vscode/extensions/merge-conflict
History
Alex Dima 47212be6f3 Settings sweep (#54690)
2018-07-30 12:35:43 +02:00
..
resources/icons Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
src Update extensions for TS 2.7 2018-02-08 14:28:55 -08:00
.vscodeignore use vsce to determine what to package when bundling extensions 2017-06-21 16:17:21 +02:00
package.json Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +02:00
package.nls.json Settings sweep (#54690) 2018-07-30 12:35:43 +02:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
tsconfig.json Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
yarn.lock Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +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.