Henning Dieterichs
5597167c4c
Fixes #79125 ( #168588 )
2022-12-09 14:06:55 +01:00
Henning Dieterichs
1f0fba4a1a
Apply suggestions from code review
...
Adds suggestions from PR.
2022-11-28 15:16:22 +01:00
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
Johannes Rieken
4a130c40ed
enable @typescript-eslint/member-delimiter-style, https://github.com/microsoft/vscode/issues/140391
2022-02-02 14:35:33 +01:00
ryenus
d75f90976b
fix typo: consecutive-word duplications
...
This fixes unintentional duplications of words, such as `the the`, and
`can can` etc. I also take the chance to make a few wording tweaks to
avoid suspicious duplications.
2019-11-27 11:07:06 +08:00
Christof Marti
039a49a5ea
Fix: Accept All Current/Incoming for multiple files ( fixes #63621 )
2019-07-01 16:15:55 +02:00
Matt Bierner
7ac8e49eb0
Add additional no unused checks for merge-conflict extension
2017-11-07 11:22:08 -08:00
Erich Gamma
b94569fe0d
tslint5 adoption - fix semicolon rule
2017-11-07 12:08:22 +01:00
Kate Miháliková
ab52889793
Handle diff3-style merge correctly ( #27405 )
2017-06-12 17:18:10 -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
