Recently, I installed TCL/TK and grabbed TKDiff, to see if that was an improvement over WinDiff, which is a visually crude but fairly reliable workhorse. To get TortoiseCVS to use it, I set up a batch file as the TortoiseCVS diff app (CVS->Preferences->Main->External diff app). For some reason, you can’t directly specify the .tcl file in TortoiseCVS. The batch file contains this line:

c:TKDiff kdiff %1 %2

I was interested in a smarter diff because of cr-lf problems I recently introduced while sailing back and forth across the windows/linux time-space continuum. Well, TKDiff barfed on all that. Can’t hold it against it, tho…

  • TKDiff – barfed – totally confused
  • WinMerge – barfed – totally confused
  • CSDiff – seemed to do OK, but MAN it’s tough reading one listing
  • WinDiff – did OK

    So I guess I am back where I started for now… I manually patched up the CR-LF problems, and I am back to liking TKDiff the best at this point… what a roller coaster ride, man I got a headache… to be continued…

  • Leave a Reply