debian / git-doc.fileson commit merge-one-file: use empty- or common-base condintionally in two-stage merge. (fd66dbf)
   1/usr/share/doc/git-core/*.txt
   2/usr/share/doc/git-core/*.html
   3/usr/share/doc/git-core/*/*.html
   4/usr/share/doc/git-core/*/*.txt