debian / git-cvs.fileson commit merge-one-file: use empty- or common-base condintionally in two-stage merge. (fd66dbf)
   1/usr/bin/git-cvs*
   2/usr/share/man/*/git-cvs*