|
…
|
||
|---|---|---|
| .. | ||
| resources/icons | ||
| src | ||
| .vscodeignore | ||
| package.json | ||
| package.nls.json | ||
| README.md | ||
| tsconfig.json | ||
| yarn.lock | ||
Merge Conflict
Notice This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
Features
Read Merge Conflicts in VS Code to learn about features of this extension.