Martin von Zweigbergk 82883e648d conflicts: move describe_conflict() etc. onto Conflict ... Before we had `conflicts::Conflict`, most of these functions took a `backend::Conflict`. I think I didn't want to pollute the `backend` module with this kind of logic, trying to keep it focused on storage. Now that we have the type in `conflicts`, however, I think it makes sense to move these functions onto it.		2023-06-19 07:05:02 +02:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	conflicts: move describe_conflict() etc. onto Conflict	2023-06-19 07:05:02 +02:00
tests	conflicts: move describe_conflict() etc. onto Conflict	2023-06-19 07:05:02 +02:00
testutils	cargo: bump tempfile from 3.5.0 to 3.6.0	2023-06-08 22:53:55 -07:00
build.rs
Cargo.toml	cargo: bump serde_json from 1.0.96 to 1.0.97	2023-06-19 06:42:19 +02:00