Svn: is there a graphical tool to help merge?

Question

(Before you say this is a duplicate of SVN Merge Tools or a Graphical View of SVN Branching / Merging Activity , please read ....)

I need a graphical merge tool in svn. I do not mean merging between files; I have a Beyond Compare and it works beautifully. I mean the merging of trees. What I would like to see is a three-dimensional merging of tree sources, which shows me which files are the same and different, and makes it easier to choose whether to keep a working version or version A or version B or a combined version of both.

I also need a way to stop svn from any automatic mergers, preventing me from approving or disapproving them.

Any suggestions?

---

edit: I present some kind of tool that behind the scenes does svn merge --dry-run and somehow analyzes the results to tell you what svn recommendations are.

Answer 1

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