{"id":4183,"date":"2006-03-09T08:10:00","date_gmt":"2006-03-09T08:10:00","guid":{"rendered":"https:\/\/blogs.msdn.microsoft.com\/buckh\/2006\/03\/09\/configuring-different-diffmerge-tools-for-team-foundation-version-control\/"},"modified":"2006-03-09T08:10:00","modified_gmt":"2006-03-09T08:10:00","slug":"configuring-different-diffmerge-tools-for-team-foundation-version-control","status":"publish","type":"post","link":"https:\/\/devblogs.microsoft.com\/buckh\/configuring-different-diffmerge-tools-for-team-foundation-version-control\/","title":{"rendered":"Configuring different diff\/merge tools for Team Foundation Version Control"},"content":{"rendered":"<p>Many of you probably know that you can <a href=\"http:\/\/msdn2.microsoft.com\/en-us\/library\/ms181446.aspx\">specify your own diff\/merge tool<\/a>.&nbsp; One thing that&#8217;s not mentioned on that documentation page is that you can specify <font face=\"Courier New\">*<\/font> for the Extension field to change the default diff or merge tool.<\/p>\n<p><a href=\"\/jmanning\">James Manning<\/a> recently put together a nice post on configuring different diff and merge tools, making it easier to properly configure the tool of your choice.&nbsp; This is most useful for merge, where for v1 a number of other available tools offer a better experience than diffmerge.exe&nbsp;in the more complex cases.<\/p>\n<blockquote>\n<p><a href=\"\/jmanning\/articles\/535573.aspx\">Diff\/Merge configuration in Team Foundation &#8211; Common command and argument values<\/a><\/p>\n<p>One of the extensibility points we have in Team Foundation V1 is that you can configure any other diff and merge tools you want.&nbsp; The purpose of this article is to start collecting the most common ones we know or heard about in a central place so people don&#8217;t have to figure these out on their own.<\/p>\n<\/blockquote>\n","protected":false},"excerpt":{"rendered":"<p>Many of you probably know that you can specify your own diff\/merge tool.&nbsp; One thing that&#8217;s not mentioned on that documentation page is that you can specify * for the Extension field to change the default diff or merge tool. James Manning recently put together a nice post on configuring different diff and merge tools, [&hellip;]<\/p>\n","protected":false},"author":94,"featured_media":10268,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[1],"tags":[6,8],"class_list":["post-4183","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-uncategorized","tag-source-control","tag-team-foundation"],"acf":[],"blog_post_summary":"<p>Many of you probably know that you can specify your own diff\/merge tool.&nbsp; One thing that&#8217;s not mentioned on that documentation page is that you can specify * for the Extension field to change the default diff or merge tool. James Manning recently put together a nice post on configuring different diff and merge tools, [&hellip;]<\/p>\n","_links":{"self":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/posts\/4183","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/users\/94"}],"replies":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/comments?post=4183"}],"version-history":[{"count":0,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/posts\/4183\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/media\/10268"}],"wp:attachment":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/media?parent=4183"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/categories?post=4183"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/tags?post=4183"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}