pub fn parse_conflict(
input: &[u8],
num_sides: usize,
) -> Option<Vec<Merge<BString>>>Expand description
Parses conflict markers from a slice. Returns None if there were no valid conflict markers. The caller has to provide the expected number of merge sides (adds). Conflict markers that are otherwise valid will be considered invalid if they don’t have the expected arity.