fly/code_tool_fly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3ee3614a29f06d992acd99af0cd9e08b1affc2e4
code_tool_fly/VSCode-win32-x64-1.74.0/resources/app/extensions/merge-conflict
T
History
wangxinfei 7a31266d21 init tool
2025-05-09 16:55:09 +08:00
..
dist
init tool
2025-05-09 16:55:09 +08:00
media
init tool
2025-05-09 16:55:09 +08:00
package.json
init tool
2025-05-09 16:55:09 +08:00
package.nls.json
init tool
2025-05-09 16:55:09 +08:00
README.md
init tool
2025-05-09 16:55:09 +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.

Reference in New Issue View Git Blame Copy Permalink