Enum diffy::ConflictStyle
source · [−]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
Auto Trait Implementations
impl RefUnwindSafe for ConflictStyle
impl Send for ConflictStyle
impl Sync for ConflictStyle
impl Unpin for ConflictStyle
impl UnwindSafe for ConflictStyle
Blanket Implementations
Mutably borrows from an owned value. Read more