title: Visual Studio Code Compare (for merging) for CSS and JS
body: <p>In Visual Studio 2010 the code comparison tool used when merging changes is not very good when trying to merge CSS and JS files.</p>
  
  <p>Any suggestions on a good third-party merge tool that works well with CSS and JS files and that we can integrate with VS2010?</p>