mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-02 18:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

conflicts: fix a typo (lossy conflict -> lossy conversion)

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-06-12 23:38:11 -07:00 committed by Martin von Zweigbergk
parent eb4f6a2c92
commit bbbae2c172
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/conflicts.rs
View file

@ -104,7 +104,7 @@ impl Conflict<Option<TreeValue>> {
}
/// Creates a `backend::Conflict` from a `Conflict` by dropping `None`
/// values. Note that the conflict is lossy: the order of `None` values is
/// values. Note that the conversion is lossy: the order of `None` values is
/// not preserved when converting back to a `Conflict`.
pub fn to_backend_conflict(&self) -> backend::Conflict {
let removes = self