Struct diffy::MergeOptions

pub struct MergeOptions { /* private fields */ }

A collection of options for modifying the way a merge is performed

Implementations

impl MergeOptions

pub fn new() -> Self

Constructs a new MergeOptions with default settings

Defaults

• conflict_marker_length = 7
• style = ConflictStyle::Diff3

pub fn set_conflict_marker_length(
    &mut self,
    conflict_marker_length: usize
) -> &mut Self

Set the length of the conflict markers used when displaying a merge conflict

pub fn set_conflict_style(&mut self, style: ConflictStyle) -> &mut Self

Set the conflict style used when displaying a merge conflict

pub fn merge<'a>(
    &self,
    ancestor: &'a str,
    ours: &'a str,
    theirs: &'a str
) -> Result<String, String>

Merge two files, given a common ancestor, based on the configured options

pub fn merge_bytes<'a>(
    &self,
    ancestor: &'a [u8],
    ours: &'a [u8],
    theirs: &'a [u8]
) -> Result<Vec<u8>, Vec<u8>>

Perform a 3-way merge between potentially non-utf8 texts

Trait Implementations

impl Debug for MergeOptions

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Default for MergeOptions

fn default() -> Self

Returns the “default value” for a type.