Struct MergeOptions

pub struct MergeOptions {
    pub conflict_marker_length: usize,
    pub style: ConflictStyle,
    pub algorithm: Algorithm,
}

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

Fields

conflict_marker_length: usize

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

style: ConflictStyle

The conflict style used when displaying a merge conflict

algorithm: Algorithm

Implementations

impl MergeOptions

pub fn new() -> Self

Constructs a new MergeOptions with default settings

Defaults

• conflict_marker_length = 7
• style = ConflictStyle::Diff3

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 The algorithm set in Self::algorithm is used for computing the diff between ancestor and ours, and between ancestor and theirs

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.