This website requires JavaScript.
Explore
Help
Sign In
development
/
vscode
Watch
1
Star
0
Fork
You've already forked vscode
0
mirror of
https://github.com/Microsoft/vscode
synced
2024-09-18 01:58:27 +00:00
Code
Issues
Packages
Projects
Releases
Wiki
Activity
2b7cf86439
vscode
/
extensions
/
merge-conflict
History
Christof Marti
2b7cf86439
Extract merge-conflict colors as workbench colors (
#27299
)
2017-05-26 09:27:59 +02:00
..
src
Extract merge-conflict colors as workbench colors (
#27299
)
2017-05-26 09:27:59 +02:00
package.json
Remove proposed api references, update configuration title localization.
2017-05-23 11:54:43 -07:00
package.nls.json
Remove proposed api references, update configuration title localization.
2017-05-23 11:54:43 -07:00
tsconfig.json
Initial merge of 'better-merge' extension into core extensions.
2017-05-22 13:56:18 -07:00