Sergey Kintsel 31baddd594 Fix typo in MergeDecorator class name

2018-01-08 12:09:08 +01:00

..

src

Fix typo in MergeDecorator class name

2018-01-08 12:09:08 +01:00

.vscodeignore

use vsce to determine what to package when bundling extensions

2017-06-21 16:17:21 +02:00

package.json

Adds "Accept All Current" to command palette

2017-11-27 15:48:02 -08:00

package.nls.json

Adds "Accept All Current" to command palette

2017-11-27 15:48:02 -08:00

tsconfig.json

Add additional no unused checks for merge-conflict extension

2017-11-07 11:22:08 -08:00

yarn.lock

yarn: replace most shrinkwrap files

2017-11-13 23:03:52 +01:00