B:BD[
2.330] → [
2.330:463]
let conflict_type = conflict_type(c);
let path = conflict_path(c);
println!(" {} {}", conflict_type, path);
match c {
Conflict::Name { path, .. } => println!(" name {}", path),
Conflict::Order { path, line, .. } => println!(" order {}:{}", path, line),
Conflict::Zombie { path, line, .. } => println!(" zombie {}:{}", path, line),
Conflict::ZombieFile { path, .. } => println!(" zombiefile {}", path),
Conflict::Cyclic { path, line, .. } => println!(" cycle {}:{}", path, line),
Conflict::MultipleNames { path, names, .. } => {
println!(" multiname {} {:?}", path, names)
}
}