leo 1d80d001dd feature: show MINE and THEIRS revision in merge conflict editor ...

- Rename some resources about conflicts
- Rename `MergeConflictEditor.XXXDiffLines` to `MergeConflictEditor.XXXLines`
- It's not necessary to show commit info in tooltip for conflict revisions
- New UI/UX for merge conflict editor

Signed-off-by: leo <longshuang@msn.cn>

2026-02-03 12:45:39 +08:00

..

Fonts

project: reorganize the structure of the project.

2024-04-02 20:00:33 +08:00

Grammars

feat: add Vue.js syntax highlighting (#1785)

2025-09-02 16:53:58 +08:00

Images

enhance: use different icon for Visual Studio Preview

2025-07-11 11:18:53 +08:00

Locales

localization: update Russian translate (#2089)

2026-02-02 15:05:42 +08:00

Icons.axaml

ux: refine icons

2026-01-17 15:54:05 +08:00

Styles.axaml

ux: use monospace font for inline code in commit message

2026-01-15 15:48:51 +08:00

Themes.axaml

feature: show MINE and THEIRS revision in merge conflict editor

2026-02-03 12:45:39 +08:00