pub enum MergeDriverKind {
Regenerate,
Ours,
Theirs,
}Expand description
Built-in merge driver kinds.
Variants§
Regenerate
Re-generate the file deterministically from merged sources.
Requires command in [[merge.drivers]].
Ours
Deterministically keep the epoch/main version (base side).
Theirs
Deterministically keep the workspace side.
Only valid when exactly one workspace touched the path.
Trait Implementations§
Source§impl Clone for MergeDriverKind
impl Clone for MergeDriverKind
Source§fn clone(&self) -> MergeDriverKind
fn clone(&self) -> MergeDriverKind
Returns a duplicate of the value. Read more
1.0.0 · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreSource§impl Debug for MergeDriverKind
impl Debug for MergeDriverKind
Source§impl<'de> Deserialize<'de> for MergeDriverKind
impl<'de> Deserialize<'de> for MergeDriverKind
Source§fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
Source§impl Display for MergeDriverKind
impl Display for MergeDriverKind
Source§impl Hash for MergeDriverKind
impl Hash for MergeDriverKind
Source§impl PartialEq for MergeDriverKind
impl PartialEq for MergeDriverKind
impl Eq for MergeDriverKind
impl StructuralPartialEq for MergeDriverKind
Auto Trait Implementations§
impl Freeze for MergeDriverKind
impl RefUnwindSafe for MergeDriverKind
impl Send for MergeDriverKind
impl Sync for MergeDriverKind
impl Unpin for MergeDriverKind
impl UnsafeUnpin for MergeDriverKind
impl UnwindSafe for MergeDriverKind
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§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.