mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00

Files

ryenus d75f90976b fix typo: consecutive-word duplications

This fixes unintentional duplications of words, such as `the the`, and
`can can` etc. I also take the chance to make a few wording tweaks to
avoid suspicious duplications.

2019-11-27 11:07:06 +08:00

resources/icons

[ImgBot] Optimize images

2018-11-06 20:46:03 +00:00

src

fix typo: consecutive-word duplications

2019-11-27 11:07:06 +08:00

.vscodeignore

…

extension.webpack.config.js

fix webpack entries for merge-conflict and search-rg

2018-09-20 09:59:24 +02:00

package.json

debt - bump node.d.ts dependency in extensions to 12.x (part of #82514 )

2019-10-28 08:11:47 +01:00

package.nls.json

Add enumDescriptions for merge-conflict.diffViewPosition

2019-05-28 14:54:29 -07:00

README.md

…

tsconfig.json

Update more extensions to use shared config

2018-10-02 10:24:19 -07:00

yarn.lock

debt - bump node.d.ts dependency in extensions to 12.x (part of #82514 )

2019-10-28 08:11:47 +01: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.