ux: show conflict short format in changes view

Signed-off-by: leo <longshuang@msn.cn>
2026-05-01 06:15:41 +08:00 · 2025-05-30 10:42:02 +08:00
parent e40ca4bbe0
commit 75015d550c
5 changed files with 64 additions and 62 deletions
--- a/src/ViewModels/ChangeTreeNode.cs
+++ b/src/ViewModels/ChangeTreeNode.cs
@@ -17,6 +17,16 @@ namespace SourceGit.ViewModels
            get => Change == null;
        }

+        public bool ShowConflictMarker
+        {
+            get => Change is { IsConflicted: true };
+        }
+
+        public string ConflictMarker
+        {
+            get => Change?.ConflictMarker ?? string.Empty;
+        }
+
        public bool IsExpanded
        {
            get => _isExpanded;