mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-17 17:55:29 +00:00
a87125d08b
It took a while before I realized that conflicts could be modeled as simple algebraic expressions with positive and negative terms (they were modeled as recursive 3-way conflicts initially). We've been thinking of them that way for a while now, so let's make the `ConflictPart` name match that model. |
||
|---|---|---|
| .. | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| build.rs | ||
| Cargo.toml | ||