Marty Oehme 31dc3fa9b7 git: Change merge conflict to zdiff3 style		2025-02-07 13:12:47 +01:00
..
config	git: Change merge conflict to zdiff3 style	2025-02-07 13:12:47 +01:00
ignore	vcs: Fix git program structure	2024-09-19 11:03:36 +02:00