templates / this--descriptionon commit merge-one-file: use empty- or common-base condintionally in two-stage merge. (fd66dbf)
   1Unnamed repository; edit this file to name it for gitweb.