[gitg] Include conflict status

[Alberto Fanjul <albfan src gnome org>]

commit ddda7f14c45b765e30150b89dea7eea85bf13d39
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Mon Mar 14 07:03:42 2022 +0100

    Include conflict status

 libgitg/gitg-stage-status-enumerator.vala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/libgitg/gitg-stage-status-enumerator.vala b/libgitg/gitg-stage-status-enumerator.vala
index 58290b8d..3cfc27f4 100644
--- a/libgitg/gitg-stage-status-enumerator.vala
+++ b/libgitg/gitg-stage-status-enumerator.vala
@@ -46,11 +46,15 @@ public class StageStatusFile : Object, StageStatusItem
        private static Ggit.StatusFlags s_work_flags =
                  Ggit.StatusFlags.WORKING_TREE_MODIFIED
                | Ggit.StatusFlags.WORKING_TREE_DELETED
-               | Ggit.StatusFlags.WORKING_TREE_TYPECHANGE;
+               | Ggit.StatusFlags.WORKING_TREE_TYPECHANGE
+               | Ggit.StatusFlags.CONFLICTED;
 
        private static Ggit.StatusFlags s_untracked_flags =
                  Ggit.StatusFlags.WORKING_TREE_NEW;
 
+       private static Ggit.StatusFlags s_ignored_flags =
+                 Ggit.StatusFlags.IGNORED;
+
        public StageStatusFile(string path, Ggit.StatusFlags flags)
        {
                d_path = path;