Struct git2::MergeOptions

pub struct MergeOptions {
    // some fields omitted
}

Options to specify when merging.

Methods

impl MergeOptions

fn new() -> MergeOptions

Creates a default set of merge options.

fn find_renames(&mut self, find: bool) -> &mut MergeOptions

Detect file renames

fn rename_threshold(&mut self, thresh: u32) -> &mut MergeOptions

Similarity to consider a file renamed (default 50)

fn target_limit(&mut self, limit: u32) -> &mut MergeOptions

Maximum similarity sources to examine for renames (default 200). If the number of rename candidates (add / delete pairs) is greater than this value, inexact rename detection is aborted. This setting overrides the merge.renameLimit configuration value.

fn file_favor(&mut self, favor: FileFavor) -> &mut MergeOptions

Specify a side to favor for resolving conflicts

fn standard_style(&mut self, standard: bool) -> &mut MergeOptions

Create standard conflicted merge files

fn diff3_style(&mut self, diff3: bool) -> &mut MergeOptions

Create diff3-style file

fn simplify_alnum(&mut self, simplify: bool) -> &mut MergeOptions

Condense non-alphanumeric regions for simplified diff file

fn ignore_whitespace(&mut self, ignore: bool) -> &mut MergeOptions

Ignore all whitespace

fn ignore_whitespace_change(&mut self, ignore: bool) -> &mut MergeOptions

Ignore changes in amount of whitespace

fn ignore_whitespace_eol(&mut self, ignore: bool) -> &mut MergeOptions

Ignore whitespace at end of line

fn patience(&mut self, patience: bool) -> &mut MergeOptions

Use the "patience diff" algorithm

fn minimal(&mut self, minimal: bool) -> &mut MergeOptions

Take extra time to find minimal diff

unsafe fn raw(&self) -> *const git_merge_options

Acquire a pointer to the underlying raw options.