3 Commits

Author	SHA1	Message	Date
6543	97189c59ff	impruve Konflict handling output	2019-03-05 21:32:31 +01:00
6543	ff4bbb8b5e	add detection of conflicts	2019-03-05 21:28:17 +01:00
6543	6abd6b6646	add-select-script	2019-03-05 19:50:08 +01:00