Module conflicts

Structs

• MaterializedTreeDiffEntry

Enums

• ConflictMarkerStyle
  Describes what style should be used when materializing conflicts.
• MaterializedTreeValue
  A type similar to MergedTreeValue but with associated data to include in e.g. the working copy or in a diff.

Functions

• extract_as_single_hunk
• materialize_merge_result
• materialize_merge_result_to_bytes
• materialize_tree_value
  Reads the data associated with a MergedTreeValue so it can be written to e.g. the working copy or diff.
• materialized_diff_stream
• parse_conflict
  Parses conflict markers from a slice.
• update_from_content
  Parses conflict markers in content and returns an updated version of file_ids with the new contents. If no (valid) conflict markers remain, a single resolves FileId will be returned.