Eric Amodio 79033ef7a1 Adds code lens on vfs files

2021-04-22 03:29:20 -04:00

..

typings

…

codelensProvider.ts

Adds code lens on vfs files

2021-04-22 03:29:20 -04:00

commandHandler.ts

Add next/prev conflicts (#97613)

2021-03-31 10:46:11 +02:00

contentProvider.ts

…

delayer.ts

Update to use TS 4.1 for building VS Code

2020-09-16 11:58:01 -07:00

documentMergeConflict.ts

…

documentTracker.ts

Remove delay (fixes #62652)

2020-03-27 10:55:17 +01:00

interfaces.ts

…

mergeConflictMain.ts

make merge-conflic serverless

2020-06-12 11:03:52 +02:00

mergeConflictParser.ts

Only match exactly 7 equals (fixes #95040)

2021-02-09 10:35:10 +01:00

mergeDecorator.ts

…

services.ts

…