jineens

Merge Editor broke

12

Type: Bug i'm rebasing and have a merge conflict in a file. After the last update to insiders, vscode no longer detects where the merge conflict is (no highlights, no...