[−][src]Enum diffy::ConflictStyle
Style used when rendering a conflict
Variants
Renders conflicting lines from both files, separated by conflict markers.
<<<<<<< A
lines in file A
=======
lines in file B
>>>>>>> B
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
impl Clone for ConflictStyle
[src]
fn clone(&self) -> ConflictStyle
[src]
fn clone_from(&mut self, source: &Self)
1.0.0[src]
impl Copy for ConflictStyle
[src]
impl Debug for ConflictStyle
[src]
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
impl<T> Any for T where
T: 'static + ?Sized,
[src]
T: 'static + ?Sized,
impl<T> Borrow<T> for T where
T: ?Sized,
[src]
T: ?Sized,
impl<T> BorrowMut<T> for T where
T: ?Sized,
[src]
T: ?Sized,
fn borrow_mut(&mut self) -> &mut T
[src]
impl<T> From<T> for T
[src]
impl<T, U> Into<U> for T where
U: From<T>,
[src]
U: From<T>,
impl<T> ToOwned for T where
T: Clone,
[src]
T: Clone,
type Owned = T
The resulting type after obtaining ownership.
fn to_owned(&self) -> T
[src]
fn clone_into(&self, target: &mut T)
[src]
impl<T, U> TryFrom<U> for T where
U: Into<T>,
[src]
U: Into<T>,
type Error = Infallible
The type returned in the event of a conversion error.
fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>
[src]
impl<T, U> TryInto<U> for T where
U: TryFrom<T>,
[src]
U: TryFrom<T>,