16 Commits

Author	SHA1	Message	Date
Henning Dieterichs	741f5b480a	Fixes flashing of inline conflict marker code lenses (#168598)	2022-12-09 15:16:55 +01:00
Matt Bierner	cdc521af16	Adopt l10n for merge-conflict (#165531) ... For #164438	2022-11-04 11:26:04 -07:00
Johannes	0656d21d11	auto-fixed prefer-const violation	2022-06-08 17:49:21 +02:00
Eric Amodio	79033ef7a1	Adds code lens on vfs files	2021-04-22 03:29:20 -04:00
Wenlu Wang	96d0dc4154	Add next/prev conflicts (#97613)	2021-03-31 10:45:21 +02:00
Sandeep Somavarapu	81ec777df2	support merge code lens for vscode-userdata	2019-09-20 22:09:21 +02:00
Matt Bierner	308c1887df	Update extensions for TS 2.7 ... Update src to build with TS 2.7 Explicitly assign this.message in the else body	2018-02-08 14:28:55 -08:00
Matt Bierner	7ac8e49eb0	Add additional no unused checks for merge-conflict extension	2017-11-07 11:22:08 -08:00
Christof Marti	af9f708041	Only register for file: and untitled: (fixes #33133)	2017-08-30 15:39:13 -07:00
Christof Marti	005c78dbf0	Title case (fixes #27569)	2017-05-31 10:39:36 -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	aba193c3a4	Ensure that changing codeLens.enabled responds immediately	2017-05-23 09:57:41 -07:00
Phil Price	4dcf156655	Update compare command	2017-05-22 17:42:26 -07:00
Phil Price	fd94a29f3a	Localization for codelens and warning messages.	2017-05-22 14:21:36 -07:00
Phil Price	a8fe17a808	Update codelens peer command names	2017-05-22 14:10:46 -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