ilyagr.bsky.social
just playing with tangled
conflicts: fix a typo (lossy conflict -> lossy conversion)
authored by
Martin von Zweigbergk
and committed by
Martin von Zweigbergk
bbbae2c1
eb4f6a2c
+1
-1
+1
-1
lib/src/conflicts.rs
+1
-1
lib/src/conflicts.rs
···
104
104
}
105
105
106
106
/// Creates a `backend::Conflict` from a `Conflict` by dropping `None`
107
-
/// values. Note that the conflict is lossy: the order of `None` values is
107
+
/// values. Note that the conversion is lossy: the order of `None` values is
108
108
/// not preserved when converting back to a `Conflict`.
109
109
pub fn to_backend_conflict(&self) -> backend::Conflict {
110
110
let removes = self