adapt to changes in gix-merge

Author: Byron

gitoxide-core/src/repository/merge/commit.rs

@@ -49,7 +49,7 @@ pub fn commit(
         .merge_commits(ours_id, theirs_id, labels, options.into())?
         .tree_merge;
     let has_conflicts = res.conflicts.is_empty();
-    let has_unresolved_conflicts = res.has_unresolved_conflicts(TreatAsUnresolved::Renames);
+    let has_unresolved_conflicts = res.has_unresolved_conflicts(TreatAsUnresolved::default());
     {
         let _span = gix::trace::detail!("Writing merged tree");
         let mut written = 0;

gitoxide-core/src/repository/merge/tree.rs

@@ -64,7 +64,7 @@ pub(super) mod function {
         };
         let res = repo.merge_trees(base_id, ours_id, theirs_id, labels, options)?;
         let has_conflicts = res.conflicts.is_empty();
-        let has_unresolved_conflicts = res.has_unresolved_conflicts(TreatAsUnresolved::Renames);
+        let has_unresolved_conflicts = res.has_unresolved_conflicts(TreatAsUnresolved::default());
         {
             let _span = gix::trace::detail!("Writing merged tree");
             let mut written = 0;

gix/src/repository/merge.rs

@@ -108,6 +108,7 @@ impl Repository {
             fail_on_conflict: None,
             marker_size_multiplier: 0,
             symlink_conflicts: None,
+            tree_conflicts: None,
             allow_lossy_resolution: false,
         }
         .into())