merge-one-file: use empty blob for add/add base