histalek 3bc2816c22 feat(git): Use 'diff3' style for merge conflicts		2023-11-07 15:49:34 +01:00
..
config	feat(git): Use 'diff3' style for merge conflicts	2023-11-07 15:49:34 +01:00
gitignore	git: Move global gitignore to config directory	2022-10-04 20:36:17 +02:00