development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Christof Marti ab7f6e871d Add link to documentation (#43978)
2018-03-02 11:18:41 +01: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 Bump version (#43978) 2018-02-27 15:56:35 +01:00
package.nls.json Edit pass on built-in extension descriptions (#44875) 2018-03-01 16:43:06 -08:00
README.md Add link to documentation (#43978) 2018-03-02 11:18:41 +01:00
tsconfig.json Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
yarn.lock Use latest version of telemetry module 2018-02-23 14:57:27 -08:00

README.md

Merge Conflict

See documentation.

Notice This is a an extension that is bundled with Visual Studio Code.