combine-diff: diff-files fix (#2)