development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 09:08:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
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 Add icons for built-in extensions (fixes #81760) 2021-04-20 12:09:24 -07:00
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.