maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Christof Marti 039a49a5ea Fix: Accept All Current/Incoming for multiple files (fixes #63621)
2019-07-01 16:15:55 +02:00
..
resources/icons [ImgBot] Optimize images 2018-11-06 20:46:03 +00:00
src Fix: Accept All Current/Incoming for multiple files (fixes #63621) 2019-07-01 16:15:55 +02: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 Add License field to package.jsons #68423 (#68771) 2019-06-06 11:44:50 +02:00
package.nls.json Add enumDescriptions for merge-conflict.diffViewPosition 2019-05-28 14:54:29 -07:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
tsconfig.json Update more extensions to use shared config 2018-10-02 10:24:19 -07:00
yarn.lock update @types/node (#74881) 2019-06-05 10:20:01 +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.