3 Commits

Author	SHA1	Message	Date
Jonathan Lebon	788e171b7c	docs: Add more details about 3-way merge ... This came up a few times so let's go into more details in the docs.	2021-04-30 10:50:15 -04:00
Kelvin Fan	a89d011c0b	docs: Fix various typos	2020-10-19 10:55:49 -04:00
Timothée Ravier	68ac9e9c50	docs: Move and update pages from the manual	2020-10-02 14:34:48 +02:00