svn: is there a graphical tool to assist in merges?

Question

(Before you say this is a duplicate of http://stackoverflow.com/questions/218053/tools-for-svn-merging or http://stackoverflow.com/questions/10308/graphical-representation-of-svn-branch-merge-activity, please read....)

I need a graphical tool to assist in merging in svn. I don't mean per-file merging; I have Beyond Compare and it works nicely. I mean merging trees. What I would like to see is a 3-way source tree merge, that shows me which files are the same and which are different, and facilitates selecting whether to keep the working version, or version A, or version B, or a merged version of both.

I also need a way to stop svn from doing any automatic merges without letting me approve or disapprove of them.

Any suggestions?

---

edit: I'm imagining some tool that behind the scenes does a svn merge --dry-run and parses the results somehow, to tell you what svn's recommendations are.

Answer 1

To answer your second question about preventing automatic merges, there is a TortoiseSVN recipe. It can be adapted for svn.exe using --diff3-cmd switch.