4 Commits

Include renames

Author	SHA1	Message	Date
xintaofei	838185fe35	编辑器资源本地化	2026-03-15 16:08:44 +08:00
xintaofei	0b820594d9	修复合并编辑时的代码问题	2026-03-14 21:25:41 +08:00
xintaofei	2b679b5ba8	优化代码冲突解决	2026-03-14 21:17:26 +08:00
xintaofei	4129f02985	支持git冲突时弹出窗口合并代码解决冲突	2026-03-14 20:55:15 +08:00