vscode/extensions/merge-conflict
Matt Bierner b4964bcf35 Replace some common index based for loops with for-of loops
Replaces many loops of the form:

```js
for (let i = 0; i < elements.length; ++i) {
    const i = elements[i];
   ...
}
```

with:

```js
for (const element of elements) {
    ...
}
```

Mix of a horrible regex based find/replace and manual touch ups
2019-01-03 19:11:18 -08:00
..
resources/icons [ImgBot] Optimize images 2018-11-06 20:46:03 +00:00
src Replace some common index based for loops with for-of loops 2019-01-03 19:11:18 -08: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 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 yarn.lock files to use integrity 2018-09-30 16:34:43 +02: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.