Files

.github
.tours
ci
docs
lib/vscode
- .devcontainer
- .github
- .vscode
- build
- extensions
  - bat
  - clojure
  - coffeescript
  - configuration-editing
  - cpp
  - csharp
  - css-language-features
  - css
  - debug-auto-launch
  - debug-server-ready
  - docker
  - emmet
  - extension-editing
  - fsharp
  - git-ui
  - git
  - github-authentication
  - github
  - go
  - groovy
  - grunt
  - gulp
  - handlebars
  - hlsl
  - html-language-features
  - html
  - image-preview
  - ini
  - jake
  - java
  - javascript
  - json-language-features
  - json
  - julia
  - less
  - log
  - lua
  - make
  - markdown-basics
  - markdown-language-features
  - merge-conflict
    - resources
    - src
    - .vscodeignore
    - README.md
    - extension-browser.webpack.config.js
    - extension.webpack.config.js
    - package.json
    - package.nls.json
    - tsconfig.json
    - yarn.lock
  - microsoft-authentication
  - notebook-markdown-extensions
  - npm
  - objective-c
  - perl
  - php-language-features
  - php
  - powershell
  - pug
  - python
  - r
  - razor
  - ruby
  - rust
  - scss
  - search-result
  - shaderlab
  - shellscript
  - simple-browser
  - sql
  - swift
  - testing-editor-contributions
  - theme-abyss
  - theme-defaults
  - theme-kimbie-dark
  - theme-monokai-dimmed
  - theme-monokai
  - theme-quietlight
  - theme-red
  - theme-seti
  - theme-solarized-dark
  - theme-solarized-light
  - theme-tomorrow-night-blue
  - types
  - typescript-basics
  - typescript-language-features
  - vb
  - vscode-api-tests
  - vscode-colorize-tests
  - vscode-custom-editor-tests
  - vscode-notebook-tests
  - vscode-test-resolver
  - xml
  - yaml
  - cgmanifest.json
  - package.json
  - postinstall.js
  - shared.tsconfig.json
  - shared.webpack.config.js
  - yarn.lock
- remote
- resources
- scripts
- src
- test
- .editorconfig
- .eslintignore
- .eslintrc.json
- .gitattributes
- .gitignore
- .mailmap
- .mention-bot
- .yarnrc
- CONTRIBUTING.md
- LICENSE.txt
- README.md
- ThirdPartyNotices.txt
- cglicenses.json
- cgmanifest.json
- coder.js
- gulpfile.js
- package.json
- product.json
- tsfmt.json
- yarn.lock
src
test
typings
.dockerignore
.editorconfig
.eslintrc.yaml
.gitattributes
.gitignore
.prettierrc.yaml
.stylelintrc.yaml
LICENSE.txt
README.md
ThirdPartyNotices.txt
install.sh
package.json
tsconfig.json
yarn.lock

README.md

Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

Dec 15, 2020

41bee49 · Dec 15, 2020

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.