development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Ramya Achutha Rao f89c16c04c Standardize readme across built-in extensions #54098
2018-07-11 16:38:32 -07: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 Edit pass on built-in extension descriptions (#44875) 2018-03-01 16:43:06 -08:00
README.md Standardize readme across built-in extensions #54098 2018-07-11 16:38:32 -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

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