danog/code-server
1
0
Fork 0
mirror of https://github.com/danog/code-server.git synced 2024-12-15 02:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
89b6e0164f
code-server/extensions/merge-conflict/README.md
Joe Previte be3e823608 Squashed 'lib/vscode/' content from commit e5a624b788 
git-subtree-dir: lib/vscode
git-subtree-split: e5a624b788d92b8d34d1392e4c4d9789406efe8f
2020-12-15 15:52:33 -07:00

286 B
Raw 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.