Function classify_conflict_type 

pub fn classify_conflict_type(
    stderr: &str,
    status_output: Option<&str>,
) -> ConflictType

Classify the type of merge conflict from stderr and status output.