QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC
I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC
SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC
Ok(Position { change: if let Some(p) = pos.change { if let Some(p) = txn.get_internal(p) { p } else { return Err(crate::Error::InconsistentChange); }
Ok(Position {
change: if let Some(p) = pos.change {
if let Some(p) = txn.get_internal(p) {
p
} else {
return Err(crate::Error::InconsistentChange);
}
let change = if let Some(p) = pos.change { if let Some(p) = txn.get_internal(p) { p
let change = if let Some(p) = pos.change {
change_id },
change_id
},
return Err(crate::Error::InconsistentChange); } } else { change_id }; Ok(Position { change,
};
change,
) -> Result<(), anyhow::Error> {
) {
return Ok(());
return;
Ok(())
)?
);
self.replace(&d, &mut conflict_contexts, &lines_a, &lines_b, &dd, r)?
self.replace(&d, &mut conflict_contexts, &lines_a, &lines_b, &dd, r);