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	docs: replace jj concepts by markdown docs	2021-12-17 15:18:41 -08:00
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	docs: explain how not exposing "the index" in the UI is a good thing	2021-12-18 09:22:35 -08:00
git-compatibility.md	docs: correct a mention about getting long vs. short help	2022-03-09 07:48:31 -08:00
operation-log.md	docs: consistently use hyphens in filenames	2021-12-18 07:56:48 -08:00
related-work.md	docs: consistently use hyphens in filenames	2021-12-18 07:56:48 -08:00
revsets.md	revsets: add author() and committer() functions (#46)	2021-12-15 22:50:29 -08:00
tutorial.md	docs: use Git-style unified diff in the tutorial	2022-01-05 12:38:52 -08:00
working-copy.md	docs: consistently use hyphens in filenames	2021-12-18 07:56:48 -08:00