Geeks With Blogs

News




View Tarun Arora's profile on LinkedIn

profile for Tarun Arora at Stack Overflow, Q&A for professional and enthusiast programmers

Tarun Arora - Visual Studio ALM MVP ALM, Agile, Automation, Performance Testing, Software QA, Cloud, ...

 

Would you like to use your favourite comparison and merging tool such as KDiff3 or WinMerge in TFS. With little effort you can configure a different diff/merge tool in Team Foundation Server.

In this blog post I'll be covering

  1. How to change the default compare/merge tool
  2. List of available compare/merge tools and the list of arguments

Follow the steps below,

  • Open Visual Studio 2010 and go to Tools => Options

image

  • Select Source Control => Visual Studio Team Foundation

image

  • Click Configure User Tools

image

  • Lets say if you wanted to configure WinMerge for comparison of class files then use the arguments shown in the screen shot below and click ok.

image

  • Let’s try compare on a class file. Right click on any class file in source explorer and choose compare,

image

  • Voila! The class files are opened for comparison in win merge

image

 

Now the question is what all comparison or merging tools can you use, 

Product

Command

Arguments

TFS default diffmerge.exe %1 %2 %6 %7 %5 /ignorespace
WinDiff windiff.exe %1 %2
DiffDoc (for Word files)* DiffDoc.exe /M%1 /S%2
KDiff3 kdiff3.exe %1 --fname %6 %2 --fname %7

 

* So, if you wanted to compare word files you could use DiffDoc.

You can find the complete list of arguments for compare and merge tools at the blog post here

What comparison and merging tools are you using?

     kick it on DotNetKicks.com

Digg This
Posted on Saturday, July 23, 2011 6:19 PM TFS2010 , TFS Utilties | Back to top


Comments on this post: How To Change compare merge tool in TFS?

# re: How To Change compare merge tool in TFS?
Requesting Gravatar...
Thanks -- can't stand diffmerge but never even thought about changing it!
Left by Rebecca Barrilleaux on Sep 15, 2011 1:34 PM

# re: How To Change compare merge tool in TFS?
Requesting Gravatar...
Hi Rebecca,

Thanks for your comment. The next version of Visual Studio brings along in line file comparison, i guess that should effectively enhance the compare and merge experience quite well. http://blogs.msdn.com/b/bharry/archive/2011/08/31/merge-enhancements-in-tfs-11.aspx

Cheers, Tarun
Left by Tarun Arora on Sep 15, 2011 1:43 PM

# re: How To Change compare merge tool in TFS?
Requesting Gravatar...
Beyond Compare 3 Settings (Amazing tool):
- C:\Program Files (x86)\Beyond Compare 3\BComp.exe
- Compare: %1 %2 /title1=%6 /title2=%7
- Merge: %1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
Left by Erik Philips on Oct 10, 2011 8:19 PM

# re: How To Change compare merge tool in TFS?
Requesting Gravatar...
Hi Erik,

Thanks for your note. Have you seen the new diff and merge experience in TFS 2011? One might not feel the need to change the merge tool in TFS 2011. But yes i definitely felt the need to use K-diff in TFS 2010. I'll give beyond compare 3 a try as well.

Cheers, Tarun
Left by Tarun Arora on Oct 10, 2011 8:22 PM

comments powered by Disqus

Copyright © Tarun Arora [Microsoft MVP] | Powered by: GeeksWithBlogs.net | Join free