What diff tool to use for scrivener / rtfd

I have set up scrivener wtih subversion (using scpplugin for the desktop client, its quite nice but not quite tortoisesvn…). I don’t anticipate using scrivener snapshots.

What tool/program would you recommend I use for tracking my diffs? Will I be down to command-line to do this?

Thanks - Sophie