vscode

mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00

Files

History

Henning Dieterichs 741f5b480a Fixes flashing of inline conflict marker code lenses (#168598 )

2022-12-09 15:16:55 +01:00

codelensProvider.ts

2022-12-09 15:16:55 +01:00

commandHandler.ts

2022-11-04 11:26:04 -07:00

contentProvider.ts

2022-06-08 17:49:21 +02:00

delayer.ts

2022-06-08 17:49:21 +02:00

documentMergeConflict.ts

Fixes #79125 (#168588 )

2022-12-09 14:06:55 +01:00

documentTracker.ts

Fixes GDPR comment

2022-11-28 12:04:59 +01:00

interfaces.ts

2022-02-02 14:35:33 +01:00

mergeConflictMain.ts

…

mergeConflictParser.ts

2022-11-28 12:00:08 +01:00

mergeDecorator.ts

2022-11-04 11:26:04 -07:00

services.ts

2022-11-28 15:16:22 +01:00