History

chriswang521 b2638a9732 update baseCode:code-oss-1.85.2		2024-07-05 11:09:03 +08:00
..
media	from 1.68.0	2022-06-14 14:37:10 +08:00
src	update baseCode:code-oss-1.85.2	2024-07-05 11:09:03 +08:00
.vscodeignore	from 1.68.0	2022-06-14 14:37:10 +08:00
README.md	from 1.68.0	2022-06-14 14:37:10 +08:00
extension-browser.webpack.config.js	from 1.68.0	2022-06-14 14:37:10 +08:00
extension.webpack.config.js	from 1.68.0	2022-06-14 14:37:10 +08:00
package.json	update baseCode:code-oss-1.85.2	2024-07-05 11:09:03 +08:00
package.nls.json	from 1.68.0	2022-06-14 14:37:10 +08:00
tsconfig.json	from 1.68.0	2022-06-14 14:37:10 +08:00
yarn.lock	update baseCode:code-oss-1.85.2	2024-07-05 11:09:03 +08: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.