mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-06 07:52:50 +00:00
We used to have documention about how conflicts are implemented, but I removed that a long time ago when I rewrote the README to target users rather than VCS hackers. Let's have a doc for the VCS hackers (and curious users) as well, though.