jj_cli

Module merge_tools

Source

Structs§

DiffEditor
Configured diff editor.
ExternalMergeTool
Merge/diff tool loaded from the settings.
MergeEditor
Configured 3-way merge editor.
MergeToolPartialResolutionError

Enums§

ConflictResolveError
DiffEditError
DiffGenerateError
DiffTool
DiffToolMode
MergeTool
MergeToolConfigError

Functions§

generate_diff
Generates textual diff by the specified tool and writes into writer.
get_external_tool_config
Loads external diff/merge tool options from [merge-tools.<name>].
invoke_external_diff
Invokes the specified tool directing its output into writer.