? re upgrade "tidying up"
I just upgraded from 1.7.4 to 1.8.5 and it went pretty well on my IIS5 system following the instructions on tw.o.
I am left with this question, however, regarding the section on tidying up after the upgrade. The following item states:
"1. If you have made any custom modifications to Tiki files, carefully merge the changes from your backup into the 1.8.5 tree using a proper sourcecode merge tool."
I have made several changes, so I ask: what IS a proper soucecode merge tool to use here? Is there one that is part of Tiki that I need to find, or do I need to find a 3rd party tool?
Thanks in advance for any help!
bzahn