merge-file: enforce MAX_XDIFF_SIZE on incoming files