4 commits

Author	SHA1	Message	Date
b12f	702b201d1e	feat: actually working conflict resolution	2024-08-17 12:31:53 +02:00
Benjamin Bädorf	699364de3e	Fix path handling	2023-01-25 23:40:57 +01:00
Benjamin Bädorf	5577aaa159	Work with two dirs	2023-01-25 23:36:55 +01:00
Benjamin Bädorf	3273579297	Initial commit	2023-01-25 21:49:22 +01:00