[{"data":1,"prerenderedAt":293},["ShallowReactive",2],{"blog:2007:diffmerge-is-free-try-it-with-ankhsvn":3,"blogMore-Development":194,"comments-diffmerge-is-free-try-it-with-ankhsvn":207},{"_path":4,"_dir":5,"_draft":6,"_partial":6,"_locale":7,"title":8,"description":9,"date":10,"category":11,"tags":12,"excerpt":16,"body":50,"_type":182,"_id":183,"_source":184,"_file":185,"_stem":186,"_extension":187,"url":188,"wordCount":189,"minutes":190,"commentCount":191,"image":192},"/blog/2007/diffmerge-is-free-try-it-with-ankhsvn","2007",false,"en","DiffMerge is free, try it with AnkhSVN","SourceGear, known for their Vault source control software, are giving away their three-way diff & merge tool DiffMerge for Windows, Mac and Unix.","2007-06-15T11:11:52+00:00","Development",[13,14,15],".NET","AnkhSVN","Subversion",{"type":17,"children":18},"root",[19,37],{"type":20,"tag":21,"props":22,"children":23},"element","p",{},[24,27,29,31,33,35],{"type":25,"value":26},"text","SourceGear",{"type":25,"value":28},", known for their ",{"type":25,"value":30},"Vault source control software",{"type":25,"value":32},", are giving away their three-way diff & merge tool ",{"type":25,"value":34},"DiffMerge",{"type":25,"value":36}," for Windows, Mac and Unix.",{"type":20,"tag":21,"props":38,"children":39},{},[40,48],{"type":20,"tag":41,"props":42,"children":47},"img",{"className":43,"src":46},[44,45],"screenshot","right","https://img.damieng.com/blog/DiffMerge.png",[],{"type":25,"value":49},"DiffMerge has a clear interface and supports for file-type specific rule-sets that allow you to decide how to deal with white-space, line-endings, encoding etc.",{"type":17,"children":51,"toc":179},[52,78,86,100,121,130,141,149,157,171],{"type":20,"tag":21,"props":53,"children":54},{},[55,63,64,70,71,77],{"type":20,"tag":56,"props":57,"children":61},"a",{"href":58,"rel":59},"https://www.sourcegear.com",[60],"nofollow",[62],{"type":25,"value":26},{"type":25,"value":28},{"type":20,"tag":56,"props":65,"children":68},{"href":66,"rel":67},"https://www.sourcegear.com/vault/",[60],[69],{"type":25,"value":30},{"type":25,"value":32},{"type":20,"tag":56,"props":72,"children":75},{"href":73,"rel":74},"https://sourcegear.com/diffmerge/",[60],[76],{"type":25,"value":34},{"type":25,"value":36},{"type":20,"tag":21,"props":79,"children":80},{},[81,85],{"type":20,"tag":41,"props":82,"children":84},{"className":83,"src":46},[44,45],[],{"type":25,"value":49},{"type":20,"tag":21,"props":87,"children":88},{},[89,91,98],{"type":25,"value":90},"I’ll be using it instead of my trusty ",{"type":20,"tag":56,"props":92,"children":95},{"href":93,"rel":94},"https://kdiff3.sourceforge.net/",[60],[96],{"type":25,"value":97},"KDiff",{"type":25,"value":99}," for a couple of weeks to see how things go.",{"type":20,"tag":21,"props":101,"children":102},{},[103,105,111,113,119],{"type":25,"value":104},"To use DiffMerge in ",{"type":20,"tag":56,"props":106,"children":109},{"href":107,"rel":108},"https://ankhsvn.tigris.org/",[60],[110],{"type":25,"value":14},{"type":25,"value":112}," head into the ",{"type":20,"tag":114,"props":115,"children":116},"em",{},[117],{"type":25,"value":118},"Tools > AnkhSVN > Edit the AnkhSVN Configuration",{"type":25,"value":120}," menu option and then paste each of the following command-lines into the associated configuration option.",{"type":20,"tag":21,"props":122,"children":123},{},[124],{"type":20,"tag":125,"props":126,"children":127},"strong",{},[128],{"type":25,"value":129},"DiffExePath",{"type":20,"tag":131,"props":132,"children":134},"pre",{"code":133},"C:\\\\Program Files\\\\SourceGear\\\\DiffMerge\\\\DiffMerge.exe \"%base\" \"%mine\" /t1=\"Base version\" /t2=\"My version\"\n",[135],{"type":20,"tag":136,"props":137,"children":139},"code",{"__ignoreMap":138},"",[140],{"type":25,"value":133},{"type":20,"tag":21,"props":142,"children":143},{},[144],{"type":20,"tag":125,"props":145,"children":146},{},[147],{"type":25,"value":148},"MergeExePath",{"type":20,"tag":131,"props":150,"children":152},{"code":151},"C:\\\\Program Files\\\\SourceGear\\\\DiffMerge\\\\DiffMerge.exe \"%base\" \"%theirs\" \"%mine\" /r=\"%merged\" /t1=\"Base version\" /t2=\"Their version\" /t3=\"My version\"\n",[153],{"type":20,"tag":136,"props":154,"children":155},{"__ignoreMap":138},[156],{"type":25,"value":151},{"type":20,"tag":21,"props":158,"children":159},{},[160,162,169],{"type":25,"value":161},"Alternatively you might want to check out Trevor Green’s ",{"type":20,"tag":56,"props":163,"children":166},{"href":164,"rel":165},"https://dotnet.org.za/trumpi/archive/2007/06/05/sourcegear-release-diffmerge-for-free.aspx",[60],[167],{"type":25,"value":168},"instructions on using DiffMerge with TortoiseSVN",{"type":25,"value":170}," if you are not yet sold on AnkhSVN and it’s Visual Studio integration.",{"type":20,"tag":21,"props":172,"children":173},{},[174],{"type":20,"tag":114,"props":175,"children":176},{},[177],{"type":25,"value":178},"[)amien",{"title":138,"searchDepth":180,"depth":180,"links":181},2,[],"markdown","content:blog:2007:diffmerge-is-free-try-it-with-ankhsvn.md","content","blog/2007/diffmerge-is-free-try-it-with-ankhsvn.md","blog/2007/diffmerge-is-free-try-it-with-ankhsvn","md","/blog/2007/diffmerge-is-free-try-it-with-ankhsvn/",150,1,4,{"className":193,"src":46},[44,45],[195,199,203],{"title":196,"date":197,"url":198},"HTML5 Video Cheatsheet: Optimizing videos for the web","2025-12-05T00:00:00Z","/blog/2025/html5-video-cheatsheet/",{"title":200,"date":201,"url":202},"Transactions in the MongoDB EF Core Provider","2025-10-25","/blog/2025/mongodb-explicit-transactions/",{"title":204,"date":205,"url":206},"Queryable Encryption with the MongoDB EF Core Provider","2025-09-22","/blog/2025/mongodb-queryable-encryption/",[208,229,250,271],{"_path":209,"_dir":210,"_draft":6,"_partial":6,"_locale":7,"title":211,"description":212,"id":213,"name":214,"email":215,"avatar":216,"date":217,"body":218,"_type":182,"_id":226,"_source":184,"_file":227,"_stem":228,"_extension":187},"/comments/diffmerge-is-free-try-it-with-ankhsvn/41973","diffmerge-is-free-try-it-with-ankhsvn","41973","I still needed to configure it. Also, note that you need to replace the quotation marks in the configuration strings with straight quotes.",41973,"abrak.jamson","abrak.jamson@gmail.com","https://www.gravatar.com/avatar/2b7ef3561d4ce5a79f9978da5560a9d8?r=pg&d=retro","2010-06-14T11:13:14",{"type":17,"children":219,"toc":224},[220],{"type":20,"tag":21,"props":221,"children":222},{},[223],{"type":25,"value":212},{"title":138,"searchDepth":180,"depth":180,"links":225},[],"content:comments:diffmerge-is-free-try-it-with-ankhsvn:41973.md","comments/diffmerge-is-free-try-it-with-ankhsvn/41973.md","comments/diffmerge-is-free-try-it-with-ankhsvn/41973",{"_path":230,"_dir":210,"_draft":6,"_partial":6,"_locale":7,"title":231,"description":232,"id":233,"name":234,"email":235,"avatar":236,"url":237,"date":238,"body":239,"_type":182,"_id":247,"_source":184,"_file":248,"_stem":249,"_extension":187},"/comments/diffmerge-is-free-try-it-with-ankhsvn/37683","37683","The configuration is no longer needed. Ankhsvn now detects installer diff/merge tools.",37683,"cguillemette","cguillemette@gmail.com","https://www.gravatar.com/avatar/47fb157b1aece9d4e86d8d0211968cc9?r=pg&d=retro","https://www.euforik.com","2010-03-09T05:49:39",{"type":17,"children":240,"toc":245},[241],{"type":20,"tag":21,"props":242,"children":243},{},[244],{"type":25,"value":232},{"title":138,"searchDepth":180,"depth":180,"links":246},[],"content:comments:diffmerge-is-free-try-it-with-ankhsvn:37683.md","comments/diffmerge-is-free-try-it-with-ankhsvn/37683.md","comments/diffmerge-is-free-try-it-with-ankhsvn/37683",{"_path":251,"_dir":210,"_draft":6,"_partial":6,"_locale":7,"title":252,"description":253,"id":254,"name":255,"email":256,"avatar":257,"url":258,"date":259,"body":260,"_type":182,"_id":268,"_source":184,"_file":269,"_stem":270,"_extension":187},"/comments/diffmerge-is-free-try-it-with-ankhsvn/1921","1921","It's quite nice, but I do miss the syntax highlighting that WinMerge does. A small thing but I've gotten used to it.",1921,"steve","steve@stevestreeting.com","https://www.gravatar.com/avatar/fbe8cc9ac5bc8797382e01e10f5f8e33?r=pg&d=retro","https://www.stevestreeting.com","2007-06-15T15:09:07",{"type":17,"children":261,"toc":266},[262],{"type":20,"tag":21,"props":263,"children":264},{},[265],{"type":25,"value":253},{"title":138,"searchDepth":180,"depth":180,"links":267},[],"content:comments:diffmerge-is-free-try-it-with-ankhsvn:1921.md","comments/diffmerge-is-free-try-it-with-ankhsvn/1921.md","comments/diffmerge-is-free-try-it-with-ankhsvn/1921",{"_path":272,"_dir":210,"_draft":6,"_partial":6,"_locale":7,"title":273,"description":274,"id":275,"name":255,"email":256,"avatar":257,"url":258,"date":276,"body":277,"_type":182,"_id":290,"_source":184,"_file":291,"_stem":292,"_extension":187},"/comments/diffmerge-is-free-try-it-with-ankhsvn/1920","1920","I've always been pretty happy with WinMerge, although it doesn't have an OSX or Linux version. Doesn't have a 3-way merge but given the way I work with merging (always via patches rather than snapshots) I've never found I needed that.",1920,"2007-06-15T12:35:20",{"type":17,"children":278,"toc":288},[279,283],{"type":20,"tag":21,"props":280,"children":281},{},[282],{"type":25,"value":274},{"type":20,"tag":21,"props":284,"children":285},{},[286],{"type":25,"value":287},"I'd be a little wary of this one being abandonware (since it's not open source) but it will be interesting to see what it's like.",{"title":138,"searchDepth":180,"depth":180,"links":289},[],"content:comments:diffmerge-is-free-try-it-with-ankhsvn:1920.md","comments/diffmerge-is-free-try-it-with-ankhsvn/1920.md","comments/diffmerge-is-free-try-it-with-ankhsvn/1920",1779264593142]