pub enum ChunkKind {
Stable,
Ours,
Theirs,
Agree,
Conflict,
}Expand description
合并块的类型。
Variants§
Stable
双方均未改动,内容与 base 一致
Ours
仅本地(ours)改动,可无冲突应用
Theirs
仅远端(theirs)改动,可无冲突应用
Agree
双方改动且内容一致,可无冲突应用
Conflict
双方改动且内容不同,需人工解决
Trait Implementations§
impl Copy for ChunkKind
impl Eq for ChunkKind
impl StructuralPartialEq for ChunkKind
Auto Trait Implementations§
impl Freeze for ChunkKind
impl RefUnwindSafe for ChunkKind
impl Send for ChunkKind
impl Sync for ChunkKind
impl Unpin for ChunkKind
impl UnsafeUnpin for ChunkKind
impl UnwindSafe for ChunkKind
Blanket Implementations§
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
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§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> IntoEither for T
impl<T> IntoEither for T
Source§fn into_either(self, into_left: bool) -> Either<Self, Self>
fn into_either(self, into_left: bool) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left is true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreSource§fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left(&self) returns true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read more