combine-diff: diff-files fix.