development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 13:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
vscode/extensions/merge-conflict
History
Matt Bierner 92a9a07213 Remove duplicate blank lines at the start of some extension src files
2018-10-02 16:28:19 -07:00
..
resources/icons
src Remove duplicate blank lines at the start of some extension src files 2018-10-02 16:28:19 -07:00
.vscodeignore Avoid shipping unnecessary files 2018-09-19 19:53:46 +02:00
extension.webpack.config.js fix webpack entries for merge-conflict and search-rg 2018-09-20 09:59:24 +02:00
package.json Off by default (#45853) 2018-10-02 16:00:43 +02:00
package.nls.json Merge branch 'master' into Issue-#45853-checked 2018-10-02 15:57:39 +02:00
README.md
tsconfig.json Update more extensions to use shared config 2018-10-02 10:24:19 -07:00
yarn.lock update yarn.lock files to use integrity 2018-09-30 16:34:43 +02: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.