fixed a bug in r29066 which would make the button retry the merge instead of solving the conflicts. But a retry-merge should not make the dialog hang? When I did that the merge immediately went through. But of course I'm using a small repo to test, maybe your merge is really big?
-- 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/1c5f6fe7-8c88-4c14-8106-6a537d2865b5n%40googlegroups.com.
