Module jj_cli::merge_tools

Structs

• ExternalMergeTool
  Merge/diff tool loaded from the settings.

Enums

• ConflictResolveError
• DiffEditError
• DiffGenerateError
• MergeTool

Functions

• edit_diff
• generate_diff
  Generates textual diff by the specified tool, and writes into writer.
• get_tool_config
  Loads merge tool options from [merge-tools.<name>].
• get_tool_config_from_args
  Loads merge tool options from [merge-tools.<name>] if args is of unstructured string type.
• run_mergetool