combined diff: correctly handle truncated file