WinMerge

A really handy diff tool. Grab it from ​http://winmerge.org/

For Winmerge, add these commands to Linefilters:

^\Wsvn \WId: .*\$
^\W svn \WId: .*\$
^\W\W svn \WId: .*\$
^\W\Wsvn \WId: .*\$
^\W\Wsvn .*\$

Add this file as a filter file in c:\Program Files\Winmerge\Filters\subversion.flt

## This is a directory/file filter for WinMerge
## This filter suppresses various files found in subversion
name: subversion

## This is an inclusive (loose) filter
## (it lets through everything not specified)
def: include

## Filters for filenames begin with f:
## Filters for directories begin with d:
## (Inline comments begin with " ##" and extend to the end of the line)

f: \.svn$
f: \text-base$

d: \\\Wsvn$
d: \\text-base$
d: \\.svn$
d: \\tmp$