Struct MergeEditor

pub struct MergeEditor { /* private fields */ }

Configured 3-way merge editor.

Implementations

impl MergeEditor

pub fn with_name( name: &str, settings: &UserSettings, path_converter: RepoPathUiConverter, conflict_marker_style: ConflictMarkerStyle, ) -> Result<Self, MergeToolConfigError>

Creates 3-way merge editor of the given name, and loads parameters from the settings.

pub fn from_settings( ui: &Ui, settings: &UserSettings, path_converter: RepoPathUiConverter, conflict_marker_style: ConflictMarkerStyle, ) -> Result<Self, MergeToolConfigError>

Loads the default 3-way merge editor from the settings.

pub fn edit_files( &self, ui: &Ui, tree: &MergedTree, repo_paths: &[&RepoPath], ) -> Result<(MergedTreeId, Option<MergeToolPartialResolutionError>), ConflictResolveError>

Starts a merge editor for the specified files.

Trait Implementations

impl Clone for MergeEditor

fn clone(&self) -> MergeEditor

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeEditor

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

Formats the value using the given formatter.