Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,922 Commits 3,673 Branches 359 Tags
4da73864453db509ad55f36b5ffc8a2aecc5b08f
Commit Graph

5 Commits

Author SHA1 Message Date
Christof Marti
1f064796b8 Register content provider (again) (fixes #40557) 2018-01-10 14:52:52 +01:00
Matt Bierner
7ac8e49eb0 Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
Phil Price
8f4e1f532d Update extension configuration options 2017-05-23 09:50:23 -07:00
Phil Price
e27196db32 Update setting section name 2017-05-23 09:06:26 -07:00
Phil Price
61f16319ab Initial merge of 'better-merge' extension into core extensions. 
- 'better-merge' command and setting namespace replaced with 'merge-conflict'
 - Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting
 2017-05-22 13:56:18 -07:00