Using WinMerge -Not

[northfork]

I recommend using Araxis Merge. I tried ALL the merge utilities and Merge is the best.

It does the best job of finding matching bits of code.
You can make custom synchronization links if you need to.
It has word wrap/line wrap. (Hello Beyond Compare!)
It has syntax highlighting which makes code easier to read.
It does beautiful three way comparisons so you can look at old original, new upgrade, and old modified all at the same time.
You can automatically compare all the files in the entire folder structure and then open three way comparisons for files that have changes that you need to merge.

You can get a free 30 day trial very easily.

Since I rarely need to perform this upgrade procedure, I just get a new free trial each time. If i did it for clients on a regular basis, I would definitely purchase. Merge has save me SO much time and saved me from so much frustration.

I recommend changing the official Zen Docs in the install download to recommend Merge

[Kim]

Thanks for the recommendation.