mirror of
https://github.com/Microsoft/vscode
synced 2024-10-30 09:08:46 +00:00
|
…
|
||
|---|---|---|
| .. | ||
| 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
See Merge Conflicts in VS Code to learn about features of this extension.