templates / this--descriptionon commit diff-files -c/--cc: combine only when both ours and theirs exist. (939aabb)
   1Unnamed repository; edit this file to name it for gitweb.