Struct jj_cli::merge_tools::ExternalMergeTool

pub struct ExternalMergeTool {
    pub program: String,
    pub diff_args: Vec<String>,
    pub edit_args: Vec<String>,
    pub merge_args: Vec<String>,
    pub merge_tool_edits_conflict_markers: bool,
}

Merge/diff tool loaded from the settings.

Fields

program: String

Program to execute. Must be defined; defaults to the tool name if not specified in the config.

diff_args: Vec<String>

Arguments to pass to the program when generating diffs. $left and $right are replaced with the corresponding directories.

edit_args: Vec<String>

Arguments to pass to the program when editing diffs. $left and $right are replaced with the corresponding directories.

merge_args: Vec<String>

Arguments to pass to the program when resolving 3-way conflicts. $left, $right, $base, and $output are replaced with paths to the corresponding files.

merge_tool_edits_conflict_markers: bool

If false (default), the $output file starts out empty and is accepted as a full conflict resolution as-is by jj after the merge tool is done with it. If true, the $output file starts out with the contents of the conflict, with JJ’s conflict markers. After the merge tool is done, any remaining conflict markers in the file parsed and taken to mean that the conflict was only partially resolved.

Implementations

impl ExternalMergeTool

pub fn with_program(program: impl Into<String>) -> Self

pub fn with_diff_args(command_args: &CommandNameAndArgs) -> Self

pub fn with_edit_args(command_args: &CommandNameAndArgs) -> Self

pub fn with_merge_args(command_args: &CommandNameAndArgs) -> Self

Trait Implementations

impl Clone for ExternalMergeTool

fn clone(&self) -> ExternalMergeTool

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for ExternalMergeTool

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

Formats the value using the given formatter.

impl Default for ExternalMergeTool

fn default() -> Self

Returns the “default value” for a type.

impl<'de> Deserialize<'de> for ExternalMergeTool

where ExternalMergeTool: Default,

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ExternalMergeTool

fn eq(&self, other: &ExternalMergeTool) -> bool

This method tests for self and other values to be equal, and is used by ==.

fn ne(&self, other: &Rhs) -> bool

This method tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl Eq for ExternalMergeTool

impl StructuralPartialEq for ExternalMergeTool