Crash during interactive merge resolution

Hi devs,

TSVN 1.5.1 crashed during interactive merge resolution. Here's what I did:

- merge single revision from one branch to another
- merge resulted in conflict, and the resolution dialog was opened
- I edited the conflict and then clicked "Resolved"

This happens on Vista x64. The server and repository are both 1.4.2. One
more note: When the conflict resolution is postponed, everything works as
expected.

I'll attach the crash dump (for some reason, the automatic mail sending
feature during crash does not work for me - it cannot find my email
configuration and instead fires up the Windows Create Internet Connection
wizard).

Regards,
Kari.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org