Merge .rpmorig and .rpmnew files.