Function difft::conflicts::apply_conflict_markers
source · [−]pub(crate) fn apply_conflict_markers(s: &str) -> Result<ConflictFiles, String>Expand description
Convert a string with conflict markers into the two conflicting file contents.