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
..
accounts	accounts.email: add option to disable an account	2025-08-07 14:08:46 -05:00
config	tests/home-cursor: don't use realPkgs	2025-04-18 15:56:09 -07:00
dbus	dbus: Create with pacakges options (#7064)	2025-05-15 12:59:12 -05:00
files	treewide: reformat nixfmt-rfc-style	2025-04-08 08:50:05 -07:00
home-environment	dconf: revert: dconf: Provide dconf (#7215)	2025-06-05 15:06:51 -05:00
i18n/input-method	fcitx5: fix iniFormat usage (#6899)	2025-04-23 15:10:12 -05:00
launchd	launchd+targets/darwin: Escape XML in plists (#7356)	2025-08-09 11:22:08 -05:00
misc	xdg-mime-apps: no spaces in default app entries	2025-09-22 20:56:58 -05:00
programs	mergiraf: add merge.conflictStyle git configuration	2025-10-14 22:59:58 -05:00
services	autotiling: init module	2025-10-11 22:19:18 -05:00
systemd	treewide: remove unused code (#6985)	2025-05-07 10:03:21 -05:00
targets-darwin	treewide: reformat nixfmt-rfc-style	2025-04-08 08:50:05 -07:00
targets-linux	treewide: reformat nixfmt-rfc-style	2025-04-08 08:50:05 -07:00
xresources	treewide: reformat nixfmt-rfc-style	2025-04-08 08:50:05 -07:00