Question about file comparing

[bluetooth]

Going from 1.3.8a to 1.3.9d.

I am using TextWrangler on a Mac.

Comparing Template files from my overrides (new folder) to template_default files in v1.3.9d (old folder). Example: I get 3 columns, differences (12 items), Only in New (33 items), and Only in Old (190 items).

So, there are 33 items that are only in my overrides, and 190 items that are only in the new template_default files of the new version 1.3.9d.

My question is, after merging my differences to the new version, do I move the 190 items that are only in my overrides to the new version or just leave them out?

Thanks in advance.

[bluetooth]

Correction: I will merge my differences from the new version to my override files. Just the opposite of merging the rest of the files. I think this is starting to make sense.