2 commits

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