João Moreno 688df5e5cc Merge pull request #27882 from marckassay/24919 ...

For 'conflict (add/add)' and 'conflict (modify/delete)' issues

2017-08-10 15:04:53 +01:00

..

resources/icons

Changed git renamed icon to orange color

2017-04-11 21:11:21 -06:00

src

Merge pull request #27882 from marckassay/24919

2017-08-10 15:04:53 +01:00

test

⚡ git: run status without buffering whole output

2017-04-18 17:16:20 +02:00

.vscodeignore

use vsce to determine what to package when bundling extensions

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

npm-shrinkwrap.json

update dependency on vscode-extension-telemetry

2017-06-30 09:57:37 -07:00

OSSREADME.json

…

package.json

Merge branch 'ashutoshdhundhara-git-tag'

2017-08-10 15:44:23 +02:00

package.nls.json

Merge branch 'ashutoshdhundhara-git-tag'

2017-08-10 15:44:23 +02:00

tsconfig.json

Add "Include" to extension TSConfig Files (#25860)

2017-05-05 11:37:59 -07:00