pub enum ConflictStyle {
    Merge,
    Diff3,
}
Expand description

Style used when rendering a conflict

Variants

Merge

Renders conflicting lines from both files, separated by conflict markers.

<<<<<<< A
lines in file A
=======
lines in file B
>>>>>>> B

Diff3

Renders conflicting lines from both files including lines from the original files, separated by conflict markers.

<<<<<<< A
lines in file A
||||||| Original
lines in Original file
=======
lines in file B
>>>>>>> B

Trait Implementations

Returns a copy of the value. Read more

Performs copy-assignment from source. Read more

Formats the value using the given formatter. Read more

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Immutably borrows from an owned value. Read more

Mutably borrows from an owned value. Read more

Returns the argument unchanged.

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

The resulting type after obtaining ownership.

Creates owned data from borrowed data, usually by cloning. Read more

Uses borrowed data to replace owned data, usually by cloning. Read more

The type returned in the event of a conversion error.

Performs the conversion.

The type returned in the event of a conversion error.

Performs the conversion.