Use Winmerge with AnkhSVN

That’s not a suggestion.

If you use AnkhSVN but haven’t already set up AnkhSVN to use Winmerge for merging and comparing, do it immediately (it’s much better than the default tool, and it’s free):

  1. Install Winmerge
  2. Open up Visual Studio and choose Tools > Options.
  3. Expand Source Control (if you can’t see it, make sure you have “show all settings” ticked)
  4. Choose Subversion User Tools
  5. For External Diff Tool and External Merge Tool, choose Winmerge.

Now you can diff and merge files (and whole folders – handy when production and source control get out of sync!) easily:

Hint: hold ALT and use the arrow keys. Up and down move you between changes, left and right copies the change from one document to the other. This allows you to find and merge the changes you need in seconds.