2 commits

Author	SHA1	Message	Date
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