Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
dev/dmitriv/finalize-button-location-api
vscode/extensions/merge-conflict/README.md
Greg Van Liew c150d0d42d Edit pass on new built-in extension comments (#54277)
2018-07-13 15:28:27 -07:00

286 B
Raw Permalink Blame History

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.

Reference in New Issue View Git Blame Copy Permalink