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
..
technical	docs: add technical doc about a conflict design	2022-03-09 21:08:41 -08:00
branches.md
code-of-conduct.md
conflicts.md	docs: add technical doc about a conflict design	2022-03-09 21:08:41 -08:00
contributing.md
git-comparison.md
git-compatibility.md	docs: correct a mention about getting long vs. short help	2022-03-09 07:48:31 -08:00
operation-log.md
related-work.md
revsets.md
tutorial.md
working-copy.md