Get content conflicts only (Order, Cyclic, Zombie).
(&self)
| 88 | |
| 89 | /// Get content conflicts only (Order, Cyclic, Zombie). |
| 90 | pub fn content_conflicts(&self) -> impl Iterator<Item = &FileConflict> { |
| 91 | self.conflicts.iter().filter(|c| c.is_content_conflict()) |
| 92 | } |
| 93 | |
| 94 | /// Add a conflict to the result. |
| 95 | pub fn add_conflict(&mut self, conflict: FileConflict) { |