vscode/extensions/merge-conflict
mxwj 018ff30de3
Some checks failed
Monaco Editor checks / Monaco Editor checks (push) Has been cancelled
Initial commit
2024-11-15 14:29:18 +08:00
..
media Initial commit 2024-11-15 14:29:18 +08:00
src Initial commit 2024-11-15 14:29:18 +08:00
.npmrc Initial commit 2024-11-15 14:29:18 +08:00
.vscodeignore Initial commit 2024-11-15 14:29:18 +08:00
extension-browser.webpack.config.js Initial commit 2024-11-15 14:29:18 +08:00
extension.webpack.config.js Initial commit 2024-11-15 14:29:18 +08:00
package-lock.json Initial commit 2024-11-15 14:29:18 +08:00
package.json Initial commit 2024-11-15 14:29:18 +08:00
package.nls.json Initial commit 2024-11-15 14:29:18 +08:00
README.md Initial commit 2024-11-15 14:29:18 +08:00
tsconfig.json Initial commit 2024-11-15 14:29:18 +08:00

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.