merge-one-file: use common as base, instead of emptiness.