title: Diff/comparison tools for TFS/VS
body: <p>Merging conflicting code could be a nightmare, especially for formatted plain text files e.g. XML. The merging tool, <a href="http://en.wikipedia.org/wiki/WinDiff" rel="nofollow">WinDiff</a>, that came with a Visual Studio really doesn't cut it for a even slightly more complicated difference. </p>
  
  <p>It is pleasant to find that VS supports 3rd party comparison tools. I wonder which ones should I consider for a corporate?</p>
  
  <p>I came across the <a href="http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools" rel="nofollow">comparison page in wikipeiad</a>, but the comparison is based on some documented features. Whereas I want to compare the intelligence of the algorithms. </p>
  
  <p>So far, I have found the following ones (feel free to add more relevant ones). </p>
  
  <ul>
  <li><a href="http://winmerge.org/" rel="nofollow">WinMerge</a></li>
  <li><a href="http://sourcegear.com/diffmerge/" rel="nofollow">DiffMerge</a></li>
  <li><a href="http://www.scootersoftware.com/" rel="nofollow">Beyond Compare</a></li>
  <li><a href="http://kdiff3.sourceforge.net/" rel="nofollow">KDiff3</a></li>
  <li><a href="http://www.grigsoft.com/wincmp3.htm" rel="nofollow">Compare It</a></li>
  </ul>
  
  <p>Please share your experience using comparison tools. Thanks!</p>