make blob::Platform::filter_mode public.

That way it can be modified after it was initialized from Git configuration.

Author: Byron

gix-merge/src/blob/builtin_driver/text/mod.rs

@@ -66,8 +66,7 @@ pub struct Options {
     /// Determine of the diff will be performed.
     /// Defaults to [`imara_diff::Algorithm::Myers`].
     pub diff_algorithm: imara_diff::Algorithm,
-    /// Decide what to do to automatically resolve conflicts, or to keep them
-    /// If `None`, add conflict markers according to `conflict_style` and `marker_size`.
+    /// Decide what to do to automatically resolve conflicts, or to keep them.
     pub conflict: Conflict,
 }
 

gix-merge/src/blob/mod.rs

@@ -158,7 +158,7 @@ pub struct Platform {
     /// Pre-configured attributes to obtain additional merge-related information.
     attrs: gix_filter::attributes::search::Outcome,
     /// The way we convert resources into mergeable states.
-    filter_mode: pipeline::Mode,
+    pub filter_mode: pipeline::Mode,
 }
 
 /// The product of a [`prepare_merge()`](Platform::prepare_merge()) call to finally