Martin von Zweigbergk ec7f9e79f6 docs: update description of conflicts to be about tree-level conflicts ... Fixes #2373		2023-11-30 14:24:48 -08:00
..
architecture.md	docs: markdown fixups, mostly to remove links pointing outside docs	2023-08-28 10:43:48 -07:00
concurrency.md	docs: More info about syncing jj repo with rsync	2023-09-06 09:15:27 -07:00
conflicts.md	docs: update description of conflicts to be about tree-level conflicts	2023-11-30 14:24:48 -08:00