Motiejus Jakštys 0c799ee87a git: merge.conflictstyle = "zdiff3"		2024-02-14 11:18:49 +02:00
..
home	git: merge.conflictstyle = "zdiff3"	2024-02-14 11:18:49 +02:00