[nitro]

Seems to work ok in 3.5.4.

What I dont get as it seems backardws imo is why Jelsoft have the new version templates are listed as the old and the and the old customised templates are listed as the new ? And if your used to reversing the radio buttons prior to comparing which would seem to be a normal way to veiw the compare window this mod will apply changes but doesnt remove it from the templates require attention listing.

I also think this should be added as standard to vb its a great addon.

Edit:

Actually it does not work properly, if you leave the old/new radio buttons as per default it will just delete your custom code not merge it, if you switch the radio buttons to what would seem to be normal (new = latest default template version/ old = old template version with custom code) it will merge the custom code with the new template but it doesnt update the templates status meaning it still shows as requiring reverting. I dont think its the hack that is the issue but how Jelsoft is labeling whats old whats new

Edit 2:

And hopefully the final edit.

Dont reverse the radio buttons you may well stiff your Default style and perhaps the master style, fortunately easy to fix.

Leave radio buttons as is:
Treat the one saying new as your new custom target

Green blocks will mostly be on the right and often contain the custom code you want to keep, checking these will drop that code into one of the magical bit bins of nowhere

Your really interested in the red blocks on the left and yellow blocks that span both sides. Check wether the red block is new code needed before checking those items, yellow will need a closer look to ensure your not going to kill a bit of custom code with an updated line, if its not, fine check it else you will need to edit this block of code manually. Save your merger and cross your fingers.

I do wonder now wether its should be left as is and not dropped in to vb as standard, could cause considerable supoort posts for newcomers who use it.