Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
See Merge Conflicts in VS Code to learn about features of this extension.
Files
merge-conflict
Folders and files
| Name | Name | Last commit date | ||
|---|---|---|---|---|
parent directory.. | ||||