mol/my-dev-server2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
main
my-dev-server2/vscode-server-linux-x64-web/extensions/merge-conflict
History
mol 263cb5ef03
Some checks failed
continuous-integration/drone/push Build is failing
Details
test
2024-07-06 22:23:31 +08:00
..
dist
test
2024-07-06 22:23:31 +08:00
media
test
2024-07-06 22:23:31 +08:00
package.json
test
2024-07-06 22:23:31 +08:00
package.nls.json
test
2024-07-06 22:23:31 +08:00
README.md
test
2024-07-06 22:23:31 +08:00

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 to learn about features of this extension.