{"id":47,"date":"2003-03-13T06:27:00","date_gmt":"2003-03-13T06:27:00","guid":{"rendered":"http:\/\/bitpost.com\/news\/?p=14"},"modified":"2008-07-24T23:45:44","modified_gmt":"2008-07-25T04:45:44","slug":"lesser-evil","status":"publish","type":"post","link":"https:\/\/bitpost.com\/news\/2003\/lesser-evil\/","title":{"rendered":"diff-on-Windows Roundup"},"content":{"rendered":"

Recently, I installed TCL\/TK and grabbed TKDiff<\/SLASH>, 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:<\/p>\n

c:TKDiff\tkdiff %1 %2<\/p>\n

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…<\/p>\n

  • TKDiff<\/SLASH> – barfed – totally confused\n
  • WinMerge<\/SLASH> – barfed – totally confused\n
  • CSDiff<\/A> – seemed to do OK, but MAN it’s tough reading one listing\n
  • WinDiff<\/SLASH> – did OK\n

    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…<\/p>\n","protected":false},"excerpt":{"rendered":"

    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 […]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"enabled":false},"version":2}},"categories":[10],"tags":[],"class_list":["post-47","post","type-post","status-publish","format-standard","hentry","category-tricks-tips-tools"],"aioseo_notices":[],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p9M11L-L","jetpack_likes_enabled":true,"_links":{"self":[{"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/posts\/47","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/comments?post=47"}],"version-history":[{"count":1,"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/posts\/47\/revisions"}],"predecessor-version":[{"id":279,"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/posts\/47\/revisions\/279"}],"wp:attachment":[{"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/media?parent=47"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/categories?post=47"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/bitpost.com\/news\/wp-json\/wp\/v2\/tags?post=47"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}