pub enum TextConflict {
Overlap,
Binary,
TooLarge,
}Expand description
Why a file could not be merged by line.
Variants§
Overlap
Both sides changed the same (or touching) lines differently.
Binary
One of the three versions is binary.
TooLarge
One of the three is larger than MAX_TEXT_MERGE_BYTES.
Implementations§
Trait Implementations§
Source§impl Clone for TextConflict
impl Clone for TextConflict
impl Copy for TextConflict
Source§impl Debug for TextConflict
impl Debug for TextConflict
impl Eq for TextConflict
Source§impl PartialEq for TextConflict
impl PartialEq for TextConflict
impl StructuralPartialEq for TextConflict
Auto Trait Implementations§
impl Freeze for TextConflict
impl RefUnwindSafe for TextConflict
impl Send for TextConflict
impl Sync for TextConflict
impl Unpin for TextConflict
impl UnsafeUnpin for TextConflict
impl UnwindSafe for TextConflict
Blanket Implementations§
impl<T> Allocation for T
Source§impl<'a, T, E> AsTaggedExplicit<'a, E> for Twhere
T: 'a,
impl<'a, T, E> AsTaggedExplicit<'a, E> for Twhere
T: 'a,
Source§impl<'a, T, E> AsTaggedImplicit<'a, E> for Twhere
T: 'a,
impl<'a, T, E> AsTaggedImplicit<'a, E> for Twhere
T: 'a,
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more
impl<ST, DT> CastableFrom<ST, Initialized, Initialized> for DT
impl<ST, DT> CastableFrom<ST, Uninit, Uninit> for DT
Source§impl<T> CloneToUninit for Twhere
T: Clone,
impl<T> CloneToUninit for Twhere
T: Clone,
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§fn equivalent(&self, key: &K) -> bool
fn equivalent(&self, key: &K) -> bool
Compare self to
key and return true if they are equal.Source§impl<T> Instrument for T
impl<T> Instrument for T
Source§fn instrument(self, span: Span) -> Instrumented<Self> ⓘ
fn instrument(self, span: Span) -> Instrumented<Self> ⓘ
Source§fn in_current_span(self) -> Instrumented<Self> ⓘ
fn in_current_span(self) -> Instrumented<Self> ⓘ
Source§impl<T> IntoRequest<T> for T
impl<T> IntoRequest<T> for T
Source§fn into_request(self) -> Request<T>
fn into_request(self) -> Request<T>
Wrap the input message
T in a tonic::Request