File tree 2 files changed +2
-3
lines changed
2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -66,8 +66,7 @@ pub struct Options {
66
66
/// Determine of the diff will be performed.
67
67
/// Defaults to [`imara_diff::Algorithm::Myers`].
68
68
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.
71
70
pub conflict : Conflict ,
72
71
}
73
72
Original file line number Diff line number Diff line change @@ -158,7 +158,7 @@ pub struct Platform {
158
158
/// Pre-configured attributes to obtain additional merge-related information.
159
159
attrs : gix_filter:: attributes:: search:: Outcome ,
160
160
/// The way we convert resources into mergeable states.
161
- filter_mode : pipeline:: Mode ,
161
+ pub filter_mode : pipeline:: Mode ,
162
162
}
163
163
164
164
/// The product of a [`prepare_merge()`](Platform::prepare_merge()) call to finally
You can’t perform that action at this time.
0 commit comments