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 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
25cabacf5d1111539c4e4f587855cf4e2d65cfec
vscode/extensions/merge-conflict
History
Dirk Baeumer 21991b4912 Move to latest vscode-nls for corrupted cache support
2018-07-03 16:12:52 +02:00
..
resources/icons
Name, description, icon for merge-conflict extension (#43978)
2018-02-26 09:48:34 +01:00
src
Update extensions for TS 2.7
2018-02-08 14:28:55 -08:00
.vscodeignore
use vsce to determine what to package when bundling extensions
2017-06-21 16:17:21 +02:00
package.json
Move to latest vscode-nls for corrupted cache support
2018-07-03 16:12:52 +02:00
package.nls.json
Edit pass on built-in extension descriptions (#44875)
2018-03-01 16:43:06 -08:00
README.md
Add link to documentation (#43978)
2018-03-02 11:18:41 +01:00
tsconfig.json
Add additional no unused checks for merge-conflict extension
2017-11-07 11:22:08 -08:00
yarn.lock
Move to latest vscode-nls for corrupted cache support
2018-07-03 16:12:52 +02:00

README.md

Merge Conflict

See documentation.

Notice This is a an extension that is bundled with Visual Studio Code.

Reference in New Issue View Git Blame Copy Permalink
Powered by Gitea Version: 1.25.5 Page: 603ms Template: 4ms
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