Module jj_lib::conflicts

source ·

Structs

  • Conflict
    A generic representation of conflicting values.

Functions

  • materialize_merge_result
  • parse_conflict
    Parses conflict markers from a slice. Returns None if there were no valid conflict markers. The caller has to provide the expected number of removed and added inputs to the conflicts. Conflict markers that are otherwise valid will be considered invalid if they don’t have the expected arity.