Module jj_cli::merge_tools

Structs

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

Enums

• ConflictResolveError
• DiffEditError
• DiffGenerateError
• 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>].