7 Commits

Author	SHA1	Message	Date
kieferrm	3f8bd163f4	update dependency on vscode-extension-telemetry	2017-06-30 09:57:37 -07:00
Christof Marti	1de69f4d8d	Remove merge keyboard shortcuts (fixes #28376)	2017-06-26 11:25:53 -07:00
Christof Marti	5b4f203e16	Remove unnecessary dependencies	2017-06-20 14:09:20 -07:00
Phil Price	61a8de29c3	Remove proposed api references, update configuration title localization.	2017-05-23 11:54:43 -07:00
Phil Price	8f4e1f532d	Update extension configuration options	2017-05-23 09:50:23 -07:00
Phil Price	83fd45c45d	Command titles and category localization support	2017-05-22 14:04:51 -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