0byt3m1n1
Path:
C:
/
Program Files
/
Microsoft VS Code
/
resources
/
app
/
extensions
/
merge-conflict
/
[
Home
]
File: README.md
# 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](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.