Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,591 Commits 3,657 Branches 358 Tags
4e5b74a4b7651019438e681fb08921e1b623ca4e
Commit Graph

1 Commits

Author SHA1 Message Date
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