Commit 1fee9f40e2ed335d4ec8899954b59b43990b97c3

Stefan Sperling 2021-04-13T08:28:24

fix 3-way merge of files which lack a final \n problem found by jrick ok millert