be3e823608
git-subtree-dir: lib/vscode git-subtree-split: e5a624b788d92b8d34d1392e4c4d9789406efe8f
286 B
286 B
Merge Conflict
Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
Features
See Merge Conflicts in VS Code to learn about features of this extension.