I use an external compare tool to do merging. This is the text from the settings dialog:
"C:\Program Files\Beyond Compare 4\BCompare.exe" ""%theirs"" ""%mine"" ""%base"" ""%merged"" Hope that helps. -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/b8fdea31-92f0-4286-840a-069079ac5547%40googlegroups.com.
