8 Commits

Author	SHA1	Message	Date
Johannes Rieken	4a130c40ed	enable @typescript-eslint/member-delimiter-style, https://github.com/microsoft/vscode/issues/140391	2022-02-02 14:35:33 +01:00
Christof Marti	039a49a5ea	Fix: Accept All Current/Incoming for multiple files (fixes #63621)	2019-07-01 16:15:55 +02:00
Alex Dima	c36258d23f	Use const enums (to inline their values in JS)	2018-09-06 20:39:19 +02:00
Matt Bierner	cd00b590a8	Enable strict in a few more extensions	2017-11-06 11:40:05 -08:00
Kate Miháliková	ab52889793	Handle diff3-style merge correctly (#27405)	2017-06-12 17:18:10 -07:00
Phil Price	537deb5209	Change document tracker to be opted out of per callee origin.	2017-05-23 11:29:53 -07:00
Phil Price	1535f99ffe	Update accept actions for new conflict parser	2017-05-22 18:31:04 -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