pub struct MergeInput<'a> {Show 14 fields
pub base: &'a [u8],
pub ours: &'a [u8],
pub theirs: &'a [u8],
pub label_ours: &'a str,
pub label_base: &'a str,
pub label_theirs: &'a str,
pub favor: MergeFavor,
pub style: ConflictStyle,
pub marker_size: usize,
pub diff_algorithm: Option<String>,
pub ignore_all_space: bool,
pub ignore_space_change: bool,
pub ignore_space_at_eol: bool,
pub ignore_cr_at_eol: bool,
}Expand description
Input and options for a three-way merge.
Fields§
§base: &'a [u8]Base (ancestor) content.
ours: &'a [u8]Our version of the file.
theirs: &'a [u8]Their version of the file.
label_ours: &'a strLabel for the ours conflict marker line.
label_base: &'a strLabel for the base conflict marker line (diff3 only).
label_theirs: &'a strLabel for the theirs conflict marker line.
favor: MergeFavorConflict resolution strategy.
style: ConflictStyleConflict marker style.
marker_size: usizeWidth of conflict markers in characters (0 → use default of 7).
diff_algorithm: Option<String>Diff algorithm.
ignore_all_space: boolIgnore all whitespace when comparing lines (-w).
ignore_space_change: boolIgnore changes in amount of whitespace (-b).
ignore_space_at_eol: boolIgnore whitespace at end of line.
ignore_cr_at_eol: boolIgnore CR at end of line.
Auto Trait Implementations§
impl<'a> Freeze for MergeInput<'a>
impl<'a> RefUnwindSafe for MergeInput<'a>
impl<'a> Send for MergeInput<'a>
impl<'a> Sync for MergeInput<'a>
impl<'a> Unpin for MergeInput<'a>
impl<'a> UnsafeUnpin for MergeInput<'a>
impl<'a> UnwindSafe for MergeInput<'a>
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more