Marko Korhonen 1962505d8e Git: enable rerere and diff3 mode		2022-11-04 12:49:31 +02:00
..
config	Git: enable rerere and diff3 mode	2022-11-04 12:49:31 +02:00