templates / this--descriptionon commit builtin/merge.c: fix a bug with trivial merges (40d7194)
   1Unnamed repository; edit this file 'description' to name the repository.