2 commits

Author	SHA1	Message	Date
Austin Horstman	cba2f9ce95	treewide: reformat nixfmt-rfc-style ... Reformat repository using new nixfmt-rfc-style.	2025-04-08 08:50:05 -07:00
Bob van der Linden	d8b4ba070f	mergiraf: init module (#6633) ... This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.	2025-03-25 21:37:24 +01:00