3 Commits

Author	SHA1	Message	Date
Martin von Zweigbergk	b64ee147ae	docs: add technical doc about a conflict design ... 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.	2022-03-09 21:08:41 -08:00
Matthew L Daniel	88cc9ffcbc	Fix a link from 423a894	2022-02-26 00:15:53 -08:00
Martin von Zweigbergk	71b0233efb	docs: add doc about a first-class conflicts	2021-12-18 08:07:28 -08:00