Re: [Tutor] WinMerge -- I'm Impressed

2009-01-04 Thread Alan Gauld
"Wayne Watson" wrote It took me 15 minutes to merge the two in an acceptable manner. I just tried the result and am happy to report that it works as expected. Glad to hear it, there are many such merge tools around some more automated than others. Doing this by inspection of printed lists

[Tutor] WinMerge -- I'm Impressed

2009-01-04 Thread Wayne Watson
Title: Signature.html Several months ago I took a Python (2.4) program (A) distributed by our sponsors and made a number of mods. About 4 months later the sponsors updated it (B) to operate under 2.5 and added a number of changes of their own. I dreaded the thought of merging A into B, so have