Struct MergeBlobOptions 

pub struct MergeBlobOptions<'a> {
    pub ours_label: &'a str,
    pub theirs_label: &'a str,
    pub base_label: &'a str,
    pub style: ConflictStyle,
    pub favor: MergeFavor,
    pub ws_ignore: WsIgnore,
}

Labels and style controlling merge_blobs conflict markers.

Fields

ours_label: &'a str

Label after the opening <<<<<<< marker (typically the local branch).

theirs_label: &'a str

Label after the closing >>>>>>> marker (typically the other branch).

base_label: &'a str

Label after the ||||||| marker (only used for ConflictStyle::Diff3).

style: ConflictStyle

Which marker style to emit.

favor: MergeFavor

How to resolve a textual conflict. MergeFavor::Union keeps both sides’ lines with no markers (and a non-conflicted result); other values leave markers (favouring ours/theirs is applied by the caller at the file level).

ws_ignore: WsIgnore

Whitespace-insensitivity for the 3-way line matching, mirroring -Xignore-space-change/-Xignore-all-space/-Xignore-space-at-eol (git’s ll_opts.xdl_opts). When non-empty, regions that differ only by ignored whitespace are not conflicts, and unchanged spans emit ours’ actual bytes (xdl_merge copies the common parts from file1). Empty (the default) is the exact, byte-for-byte merge.

Trait Implementations

impl<'a> Clone for MergeBlobOptions<'a>

fn clone(&self) -> MergeBlobOptions<'a>

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl<'a> Copy for MergeBlobOptions<'a>

impl<'a> Debug for MergeBlobOptions<'a>

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

Formats the value using the given formatter.

impl Default for MergeBlobOptions<'_>

fn default() -> Self

Returns the “default value” for a type.