mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-25 16:09:56 +00:00
d4e755b4e4
There were still many instances of `conflict` left from before we renamed `Conflict<T>` to `Merge<T>`. I decided to rename many of them based on the type parameter instead of the container. I think that made it more readable in many cases. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||