I remember discussiong this before but can't find the thread.
I have a highly customized nop store that I try to keep updated with newer nop releases. this is getting to be a pain though. I use winmerge and look for deltas between the new code and my current version, but it takes a long time to determine which changes were from me modifying the code, and from the new version.
I guess what I'd like is a 3 way merge, or a way to find all the changes I made to the current version, the let me try to apply only those changes to the newest version (and let me make any needed edits while I go)
I know winmege is not the right tool for this, but I'm not sure which one is...
Thoughts?