debian / compaton commit merge-one-file: use empty- or common-base condintionally in two-stage merge. (fd66dbf)
   14