[{"data":1,"prerenderedAt":146},["ShallowReactive",2],{"blog:2007:diffmerge-is-free-try-it-with-ankhsvn":3,"blogMore-Development":132,"comments-diffmerge-is-free-try-it-with-ankhsvn":145},{"id":4,"title":5,"body":6,"category":110,"commentCount":111,"date":112,"description":113,"excerpt":114,"extension":115,"filenames":116,"hidden":117,"image":118,"meta":120,"minutes":121,"navigation":122,"path":123,"seo":124,"showCategory":116,"stem":125,"tags":126,"updated":116,"url":129,"wordCount":130,"__hash__":131},"content\u002Fblog\u002F2007\u002Fdiffmerge-is-free-try-it-with-ankhsvn.md","DiffMerge is free, try it with AnkhSVN",{"type":7,"value":8,"toc":107},"minimark",[9,32,42,51,65,71,82,87,93,102],[10,11,12,19,20,25,26,31],"p",{},[13,14,18],"a",{"href":15,"rel":16},"https:\u002F\u002Fwww.sourcegear.com",[17],"nofollow","SourceGear",", known for their ",[13,21,24],{"href":22,"rel":23},"https:\u002F\u002Fwww.sourcegear.com\u002Fvault\u002F",[17],"Vault source control software",", are giving away their three-way diff & merge tool ",[13,27,30],{"href":28,"rel":29},"https:\u002F\u002Fsourcegear.com\u002Fdiffmerge\u002F",[17],"DiffMerge"," for Windows, Mac and Unix.",[10,33,34,41],{},[35,36],"img",{"className":37,"src":40},[38,39],"screenshot","right","https:\u002F\u002Fimg.damieng.com\u002Fblog\u002FDiffMerge.png","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.",[10,43,44,45,50],{},"I’ll be using it instead of my trusty ",[13,46,49],{"href":47,"rel":48},"https:\u002F\u002Fkdiff3.sourceforge.net\u002F",[17],"KDiff"," for a couple of weeks to see how things go.",[10,52,53,54,59,60,64],{},"To use DiffMerge in ",[13,55,58],{"href":56,"rel":57},"https:\u002F\u002Fankhsvn.tigris.org\u002F",[17],"AnkhSVN"," head into the ",[61,62,63],"em",{},"Tools > AnkhSVN > Edit the AnkhSVN Configuration"," menu option and then paste each of the following command-lines into the associated configuration option.",[10,66,67],{},[68,69,70],"strong",{},"DiffExePath",[72,73,78],"pre",{"className":74,"code":76,"language":77},[75],"language-text","C:\\\\Program Files\\\\SourceGear\\\\DiffMerge\\\\DiffMerge.exe \"%base\" \"%mine\" \u002Ft1=\"Base version\" \u002Ft2=\"My version\"\n","text",[79,80,76],"code",{"__ignoreMap":81},"",[10,83,84],{},[68,85,86],{},"MergeExePath",[72,88,91],{"className":89,"code":90,"language":77},[75],"C:\\\\Program Files\\\\SourceGear\\\\DiffMerge\\\\DiffMerge.exe \"%base\" \"%theirs\" \"%mine\" \u002Fr=\"%merged\" \u002Ft1=\"Base version\" \u002Ft2=\"Their version\" \u002Ft3=\"My version\"\n",[79,92,90],{"__ignoreMap":81},[10,94,95,96,101],{},"Alternatively you might want to check out Trevor Green’s ",[13,97,100],{"href":98,"rel":99},"https:\u002F\u002Fdotnet.org.za\u002Ftrumpi\u002Farchive\u002F2007\u002F06\u002F05\u002Fsourcegear-release-diffmerge-for-free.aspx",[17],"instructions on using DiffMerge with TortoiseSVN"," if you are not yet sold on AnkhSVN and it’s Visual Studio integration.",[10,103,104],{},[61,105,106],{},"[)amien",{"title":81,"searchDepth":108,"depth":108,"links":109},2,[],"Development",4,"2007-06-15T11:11:52+00:00","SourceGear, known for their Vault source control software, are giving away their three-way diff & merge tool DiffMerge for Windows, Mac and Unix.","[object Object]","md",null,false,{"className":119,"src":40},[38,39],{},1,true,"\u002Fblog\u002F2007\u002Fdiffmerge-is-free-try-it-with-ankhsvn",{"title":5,"description":113},"blog\u002F2007\u002Fdiffmerge-is-free-try-it-with-ankhsvn",[127,58,128],".NET","Subversion","\u002Fblog\u002F2007\u002Fdiffmerge-is-free-try-it-with-ankhsvn\u002F",150,"oDhj9HIgEiaziTmNeV6XmJaPpmZ8UaKC0G3cTzeTnTI",[133,137,141],{"title":134,"date":135,"url":136},"Transactions in the MongoDB EF Core Provider","2025-10-25","\u002Fblog\u002F2025\u002Fmongodb-explicit-transactions\u002F",{"title":138,"date":139,"url":140},"Queryable Encryption with the MongoDB EF Core Provider","2025-09-22","\u002Fblog\u002F2025\u002Fmongodb-queryable-encryption\u002F",{"title":142,"date":143,"url":144},"Lazy Loading with EF Core Proxies","2025-04-02","\u002Fblog\u002F2025\u002Fef-proxies\u002F",[],1780900531861]