Name		Name	Last commit message	Last commit date
parent directory ..
resources/icons		resources/icons
src		src
.vscodeignore		.vscodeignore
README.md		README.md
extension.webpack.config.js		extension.webpack.config.js
package.json		package.json
package.nls.json		package.nls.json
tsconfig.json		tsconfig.json
yarn.lock		yarn.lock

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.