Skip to content

Commit b26eb26

Browse files
committed
make blob::Platform::filter_mode public.
That way it can be modified after it was initialized from Git configuration.
1 parent 2261de4 commit b26eb26

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ pub struct Options {
6666
/// Determine of the diff will be performed.
6767
/// Defaults to [`imara_diff::Algorithm::Myers`].
6868
pub diff_algorithm: imara_diff::Algorithm,
69-
/// Decide what to do to automatically resolve conflicts, or to keep them
70-
/// If `None`, add conflict markers according to `conflict_style` and `marker_size`.
69+
/// Decide what to do to automatically resolve conflicts, or to keep them.
7170
pub conflict: Conflict,
7271
}
7372

gix-merge/src/blob/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pub struct Platform {
158158
/// Pre-configured attributes to obtain additional merge-related information.
159159
attrs: gix_filter::attributes::search::Outcome,
160160
/// The way we convert resources into mergeable states.
161-
filter_mode: pipeline::Mode,
161+
pub filter_mode: pipeline::Mode,
162162
}
163163

164164
/// The product of a [`prepare_merge()`](Platform::prepare_merge()) call to finally

0 commit comments

Comments
 (0)