templates / this--descriptionon commit merge-recursive: move the global obuf to struct merge_options (c7d8492)
   1Unnamed repository; edit this file to name it for gitweb.