pub fn get_conflict_markers_diff(
repo_path: &Path,
file_path: &str,
) -> Vec<DiffLine>Expand description
Returns the conflict-marker diff for a conflicted file by parsing the file on disk. Colorizes conflict blocks using DiffLineKind variants.