xuos
/
IDE_of_ICS
89
0
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity
IDE_of_ICS/code/extensions/merge-conflict
History
Wang_Weigen f5caba8e7b add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
..
media add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
src add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
.vscodeignore add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
README.md add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
extension-browser.webpack.config.js add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
extension.webpack.config.js add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
package.json add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
package.nls.json add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
tsconfig.json add orginal code for IDE of ICS 2022-09-16 15:11:53 +08:00
yarn.lock add orginal code for IDE of ICS 2022-09-16 15:11:53 +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.