Bob van der Linden ba6aaa0e0a mergiraf: add merge.conflictStyle git configuration ... Mergiraf expects merge.conflictStyle to be "diff3" in git. If this isn't the case, mergiraf cannot operate correctly. This change adds this option to git's configuration.		2025-10-14 22:59:58 -05:00
..
integration	restic: fix integration test	2025-09-17 16:24:18 +02:00
lib	lib: Improve KDL generator (#7429)	2025-07-12 14:32:14 -05:00
modules	mergiraf: add merge.conflictStyle git configuration	2025-10-14 22:59:58 -05:00
asserts.nix	treewide: reformat nixfmt-rfc-style	2025-04-08 08:50:05 -07:00
big-test.nix	treewide: Prevent IFD by default	2025-05-07 10:34:18 -05:00
darwinScrublist.nix	anvil-editor: add module	2025-10-11 22:14:37 -05:00
default.nix	xdg-mime-apps: add defaultApplicationPackages option	2025-09-19 16:23:57 +02:00
flake.nix	tests: rename test-all-* tests	2025-09-28 16:26:13 -05:00
stubs.nix	treewide: reformat nixfmt-rfc-style	2025-04-08 08:50:05 -07:00
tests.py	tests: improve debugging for failed test runs	2025-09-28 16:28:05 -05:00