12 Commits

Author	SHA1	Message	Date
Henning Dieterichs	5ff048a9e4	Add telemetry for conflict markers	2022-11-28 12:00:08 +01:00
Johannes	0656d21d11	auto-fixed prefer-const violation	2022-06-08 17:49:21 +02:00
Alexandre Schnegg	2678e4b848	Only match exactly 7 equals (fixes #95040)	2021-02-09 10:35:10 +01:00
Matt Bierner	7ac8e49eb0	Add additional no unused checks for merge-conflict extension	2017-11-07 11:22:08 -08:00
t-amqi	20cf247927	Spelling fixes	2017-08-09 10:41:18 -07:00
Christof Marti	d9d481afcd	Fix background decorations (fixes #28368)	2017-06-26 11:14:30 -07:00
Christof Marti	f7f7d7400d	Support GNU patch --merge results (fixes #28360)	2017-06-26 10:18:41 -07:00
Kate Miháliková	ab52889793	Handle diff3-style merge correctly (#27405)	2017-06-12 17:18:10 -07:00
Phil Price	b1b9619644	Cleanup and comment conflict parsing code	2017-05-23 09:02:38 -07:00
Phil Price	1535f99ffe	Update accept actions for new conflict parser	2017-05-22 18:31:04 -07:00
Phil Price	76b6b177b5	Add line by line parser for merge conflicts. ... Prior implementation in mergeConflictParserLegcacy which does a one shot regular expression.	2017-05-22 17:07:42 -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