Logo
Explore Help
Register Sign In
Microsoft/vscode
1
0
Fork 0
You've already forked vscode
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
8fdb5bc4e67aeba3587f2c7017663a7dcfdca69c
vscode/extensions/merge-conflict
History
Johannes Rieken 68e819043c use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files
2021-11-09 15:53:35 +01:00
..
media
…
src
use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files
2021-11-09 15:53:35 +01:00
.vscodeignore
…
extension-browser.webpack.config.js
…
extension.webpack.config.js
…
package.json
adopt web extensions to webpack 5
2021-07-08 21:41:03 +02:00
package.nls.json
…
README.md
…
tsconfig.json
use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files
2021-11-09 15:53:35 +01:00
yarn.lock
adopt web extensions to webpack 5
2021-07-08 21:41:03 +02:00

README.md

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.

Reference in New Issue View Git Blame Copy Permalink
Powered by Gitea Version: 1.25.5 Page: 1075ms Template: 11ms
English
Bahasa Indonesia Deutsch English Español Français Gaeilge Italiano Latviešu Magyar nyelv Nederlands Polski Português de Portugal Português do Brasil Suomi Svenska Türkçe Čeština Ελληνικά Български Русский Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어
Licenses API