Copy from diff including either new or old file version.