List of all items

Structs

• ast::AstNode
• attempts::AttemptsCache
• git::attr::GitAttrsForMerge
• git::attr::GitAttrsForSolve
• lang_profile::ChildrenGroup
• lang_profile::CommutativeParent
• lang_profile::LangProfile
• merge::CliOpts
• settings::ConflictRegexes
• settings::DisplaySettings
• solve::CliOpts

Enums

• ast::ParsingError
• newline::NewlineStyle

Functions

• bug_reporter::report_bug
• git::init
• languages
• line_based::line_based_merge
• line_based::line_based_merge_parsed
• merge::cascading_merge
• merge::line_merge_and_structured_resolution
• newline::imitate_newline_style
• newline::infer_newline_style
• newline::normalize_to_lf
• solve::solve
• utils::detect_suffix
• utils::read_file_to_string
• utils::write_string_to_file

Statics

• supported_langs::SUPPORTED_LANGUAGES

Constants

• ENABLING_ENV_VAR
• EXIT_MERGE_HAS_CONFLICTS
• EXIT_SOLVE_FAILED
• EXIT_SOLVE_HAS_CONFLICTS
• EXIT_SUCCESS
• line_based::LINE_BASED_METHOD
• settings::DEFAULT_CONFLICT_MARKER_SIZE