[−][src]Enum git2::FileFavor
Merge file favor options for MergeOptions
instruct the file-level
merging functionality how to deal with conflicting regions of the files.
Variants
When a region of a file is changed in both branches, a conflict will be recorded in the index so that git_checkout can produce a merge file with conflict markers in the working directory. This is the default.
When a region of a file is changed in both branches, the file created in the index will contain the "ours" side of any conflicting region. The index will not record a conflict.
When a region of a file is changed in both branches, the file created in the index will contain the "theirs" side of any conflicting region. The index will not record a conflict.
When a region of a file is changed in both branches, the file created in the index will contain each unique line from each side, which has the result of combining both files. The index will not record a conflict.
Trait Implementations
impl Clone for FileFavor
[src]
impl Copy for FileFavor
[src]
impl Debug for FileFavor
[src]
impl Eq for FileFavor
[src]
impl PartialEq<FileFavor> for FileFavor
[src]
impl StructuralEq for FileFavor
[src]
impl StructuralPartialEq for FileFavor
[src]
Auto Trait Implementations
impl RefUnwindSafe for FileFavor
impl Send for FileFavor
impl Sync for FileFavor
impl Unpin for FileFavor
impl UnwindSafe for FileFavor
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>,