Commit c1b057235b48f7b8bc01bd3c31348517856bc68b

Stefan Sperling 2021-09-28T20:56:05

make 'got merge' interrupt the merge upon undeleted and unversioned files