vscode/extensions/merge-conflict
2017-06-28 16:01:23 +02:00
..
src Import 'nls' in extensions entry point. Fixes #29098. 2017-06-28 16:01:23 +02:00
.vscodeignore use vsce to determine what to package when bundling extensions 2017-06-21 16:17:21 +02:00
package.json Remove merge keyboard shortcuts (fixes #28376) 2017-06-26 11:25:53 -07:00
package.nls.json Title case (fixes #27569) 2017-05-31 10:39:36 -07:00
tsconfig.json Initial merge of 'better-merge' extension into core extensions. 2017-05-22 13:56:18 -07:00