Method output_conflict_marker

atomic-core/src/output/traits.rs:680–706

(
        &mut self,
        marker: &str,
        id: usize,
        changes: Option<&[Hash]>,
    )

    }

    fn output_conflict_marker(
        &mut self,
        marker: &str,
        id: usize,
        changes: Option<&[Hash]>,
    ) -> Result<(), std::io::Error> {
        // Ensure we're on a new line
        if !self.at_newline {
            self.writer.write_all(b"\n")?;
        }

        // Write marker and ID
        write!(self.writer, "{} {}", marker, id)?;

        // Write change hashes if provided
        if let Some(hashes) = changes {
            for hash in hashes {
                let b32 = hash.to_base32();
                let short = if b32.len() >= 8 { &b32[..8] } else { &b32 };
                write!(self.writer, " [{}]", short)?;
            }
        }

        self.writer.write_all(b"\n")?;
        self.at_newline = true;
        Ok(())
    }
}

// TESTS