mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-05 23:42:50 +00:00
4e736bee46
I think its time to finally give our Conflict Algebra rule a term. This is will make our documentation alot easier, and gives it a name for new design docs. All credit goes to @martinvonz for coming up with the term in #4988.
