Struct MarkerFormat

Source

pub struct MarkerFormat {
    pub marker_length: usize,
    pub enhanced: bool,
}

Expand description

Controls conflict marker format: enhanced (weave metadata) or standard (git-compatible).

When enhanced is true (default for git merge driver), markers include entity metadata, ConGra complexity classification, and resolution hints. When enhanced is false (triggered by -l flag from jj/other tools), markers use the standard git format that tools can parse: <<<<<<< ours / ======= / >>>>>>> theirs.

Fields§

§marker_length: usize§enhanced: bool

Struct MarkerFormat Copy item path

Fields§

Implementations§

impl MarkerFormat

pub fn standard(marker_length: usize) -> Self

Trait Implementations§

impl Clone for MarkerFormat

fn clone(&self) -> MarkerFormat

fn clone_from(&mut self, source: &Self)

impl Debug for MarkerFormat

fn fmt(&self, f: &mut Formatter<'_>) -> Result

impl Default for MarkerFormat

fn default() -> Self

Auto Trait Implementations§

impl Freeze for MarkerFormat

impl RefUnwindSafe for MarkerFormat

impl Send for MarkerFormat

impl Sync for MarkerFormat

impl Unpin for MarkerFormat

impl UnsafeUnpin for MarkerFormat

impl UnwindSafe for MarkerFormat

Blanket Implementations§

impl<T> Any for Twhere T: 'static + ?Sized,

fn type_id(&self) -> TypeId

impl<T> Borrow<T> for Twhere T: ?Sized,

fn borrow(&self) -> &T

impl<T> BorrowMut<T> for Twhere T: ?Sized,

fn borrow_mut(&mut self) -> &mut T

impl<T> CloneToUninit for Twhere T: Clone,

unsafe fn clone_to_uninit(&self, dest: *mut u8)

impl<T> From<T> for T

fn from(t: T) -> T

impl<T, U> Into<U> for Twhere U: From<T>,

fn into(self) -> U

impl<T> IntoEither for T

fn into_either(self, into_left: bool) -> Either<Self, Self>

fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>where F: FnOnce(&Self) -> bool,

impl<T> Pointable for T

const ALIGN: usize

type Init = T

unsafe fn init(init: <T as Pointable>::Init) -> usize

unsafe fn deref<'a>(ptr: usize) -> &'a T

unsafe fn deref_mut<'a>(ptr: usize) -> &'a mut T

unsafe fn drop(ptr: usize)

impl<T> ToOwned for Twhere T: Clone,

type Owned = T

fn to_owned(&self) -> T

fn clone_into(&self, target: &mut T)

impl<T, U> TryFrom<U> for Twhere U: Into<T>,

type Error = Infallible

fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

impl<T, U> TryInto<U> for Twhere U: TryFrom<T>,

type Error = <U as TryFrom<T>>::Error

fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

Struct MarkerFormat

impl<T> Any for T
where T: 'static + ?Sized,

impl<T> Borrow<T> for T
where T: ?Sized,

impl<T> BorrowMut<T> for T
where T: ?Sized,

impl<T> CloneToUninit for T
where T: Clone,

impl<T, U> Into<U> for T
where U: From<T>,

fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
where F: FnOnce(&Self) -> bool,

impl<T> ToOwned for T
where T: Clone,

impl<T, U> TryFrom<U> for T
where U: Into<T>,

impl<T, U> TryInto<U> for T
where U: TryFrom<T>,