Struct git2::MergeOptions [] [src]

pub struct MergeOptions { /* fields omitted */ }

Options to specify when merging.

Methods

impl MergeOptions
[src]

[src]

Creates a default set of merge options.

[src]

Detect file renames

[src]

Similarity to consider a file renamed (default 50)

[src]

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.

[src]

Maximum number of times to merge common ancestors to build a virtual merge base when faced with criss-cross merges. When this limit is reached, the next ancestor will simply be used instead of attempting to merge it. The default is unlimited.

[src]

Specify a side to favor for resolving conflicts

[src]

Create standard conflicted merge files

[src]

Create diff3-style file

[src]

Condense non-alphanumeric regions for simplified diff file

[src]

Ignore all whitespace

[src]

Ignore changes in amount of whitespace

[src]

Ignore whitespace at end of line

[src]

Use the "patience diff" algorithm

[src]

Take extra time to find minimal diff

[src]

Acquire a pointer to the underlying raw options.

Trait Implementations

impl Default for MergeOptions
[src]

[src]

Returns the "default value" for a type. Read more