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-29 21:11:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
b09701ac1b0ccb4e75e9a3b71596a91bcf2ff0fd
vscode/extensions/merge-conflict
History
Tyler James Leonhardt 29e985eca0 rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#161819)
ref #161297
2022-09-26 11:10:54 -07:00
..
media
…
src
Enable conflict marker decorators even if merge editor is enabled. (#157982)
2022-08-12 15:21:38 +02:00
.vscodeignore
…
extension-browser.webpack.config.js
…
extension.webpack.config.js
…
package.json
rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#161819)
2022-09-26 11:10:54 -07: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
rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#161819)
2022-09-26 11:10:54 -07: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: 1081ms Template: 6ms
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