Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,240 Commits 3,672 Branches 359 Tags
b127b2b4e546a759428a4e9d0cf96857550e93cf
Commit Graph

3 Commits

Author SHA1 Message Date
Matt Bierner
7ac8e49eb0 Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
Matt Bierner
cd00b590a8 Enable strict in a few more extensions 2017-11-06 11:40:05 -08: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