The merge option is fully implemented in the svn library, so nothing in TSVN I can do about that.
But remember that a tree conflict means that the history of the file in question is 'lost'. And 'replace' means that the old content is replaced with the merged/new one. Take both of that together and you'll end up exactly with what you got: one conflicted block. Stefan -- 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/a1f07c10-47cb-4df8-9def-cc80364432ac%40googlegroups.com.
