Commit 69de9dd4215502c97f3e9b6c95cd1ce609fba278

Stefan Sperling 2021-09-03T09:02:06

limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy