templates / this--descriptionon commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1Unnamed repository; edit this file 'description' to name the repository.