Struct MergeFileOptions

pub struct MergeFileOptions { /* private fields */ }

Options for merging a file.

Implementations

impl MergeFileOptions

pub fn new() -> MergeFileOptions

Creates a default set of merge file options.

pub fn ancestor_label<T: IntoCString>(&mut self, t: T) -> &mut MergeFileOptions

Label for the ancestor file side of the conflict which will be prepended to labels in diff3-format merge files.

pub fn our_label<T: IntoCString>(&mut self, t: T) -> &mut MergeFileOptions

Label for our file side of the conflict which will be prepended to labels in merge files.

pub fn their_label<T: IntoCString>(&mut self, t: T) -> &mut MergeFileOptions

Label for their file side of the conflict which will be prepended to labels in merge files.

pub fn favor(&mut self, favor: FileFavor) -> &mut MergeFileOptions

Specify a side to favor for resolving conflicts

pub fn style_standard(&mut self, standard: bool) -> &mut MergeFileOptions

Create standard conflicted merge files

pub fn style_diff3(&mut self, diff3: bool) -> &mut MergeFileOptions

Create diff3-style file

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

Condense non-alphanumeric regions for simplified diff file

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

Ignore all whitespace

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

Ignore changes in amount of whitespace

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

Ignore whitespace at end of line

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

Use the “patience diff” algorithm

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

Take extra time to find minimal diff

pub fn style_zdiff3(&mut self, zdiff3: bool) -> &mut MergeFileOptions

Create zdiff3 (“zealous diff3”)-style files

pub fn accept_conflicts(&mut self, accept: bool) -> &mut MergeFileOptions

Do not produce file conflicts when common regions have changed

pub fn marker_size(&mut self, size: u16) -> &mut MergeFileOptions

The size of conflict markers (eg, “<<<<<<<”). Default is 7.

Trait Implementations

impl Default for MergeFileOptions

fn default() -> Self

Returns the “default value” for a type.