forked from mirrors/jj
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. |
||
|---|---|---|
| .. | ||
| mod.rs | ||
| op_store.proto | ||
| op_store.rs | ||
| store.proto | ||
| store.rs | ||
| working_copy.proto | ||
| working_copy.rs | ||