adapt to changes in gix-status

Author: Byron

gitoxide-core/src/repository/status.rs

@@ -220,7 +220,7 @@ fn print_index_entry_status(
 ) -> std::io::Result<()> {
     let char_storage;
     let status = match status {
-        EntryStatus::Conflict(conflict) => as_str(conflict),
+        EntryStatus::Conflict { summary, entries: _ } => as_str(summary),
         EntryStatus::Change(change) => {
             char_storage = change_to_char(&change);
             std::str::from_utf8(std::slice::from_ref(&char_storage)).expect("valid ASCII")

gix/src/status/index_worktree.rs

@@ -489,7 +489,7 @@ pub mod iter {
             use gix_status::index_as_worktree_with_renames::Summary::*;
             Some(match self {
                 Item::Modification { status, .. } => match status {
-                    EntryStatus::Conflict(_) => Conflict,
+                    EntryStatus::Conflict { .. } => Conflict,
                     EntryStatus::Change(change) => match change {
                         Change::Removed => Removed,
                         Change::Type { .. } => TypeChange,