Visual Studio Code Compare (for merging) for CSS and JS

Question

In Visual Studio 2010 the code comparison tool used when merging changes is not very good when trying to merge CSS and JS files.

Any suggestions on a good third-party merge tool that works well with CSS and JS files and that we can integrate with VS2010?

Answer 1

WinMerge is free, open-source, and Just Works.

Please see Change Visual Studio Compare Tool To WinMerge for instructions on how to set-up VS2010 to use WinMerge.

And here are notes on getting VS (Team System) 2008 to use WinMerge.

If you're using VisualSourceSafe (ugh), you need some additional configuration.

Answer 2

Devart Code Compare:

http://www.devart.com/codecompare/

Answer 3

BeyondCompare is excellent (though paid for):

http://www.scootersoftware.com/index.php

And has intructions for integrating with TFS: http://www.scootersoftware.com/support.php?zz=kb_vcs#tfs

nb I don't work for scooter software, I'm just a fan. My work has a group license, so depends if you want to pay for it.

Though I've also used WinMerge in the past and I'm a fan of that to.