[TSVN] Missing cancel button in TMerge dialog?

Hi

To reproduce my problem: Choose "Resolve conflicts" a file with at least
two conflicts in it. Resolve only one of them and close TMerge. It asks
if I want to save the file. Choose yes. A warning is shown that the file
still contains conflicts. From this dialog, TMerge closes regardless of
whether I choose yes or no. There is no way to return to TSVN without
saving. I need a cancel option or have the "no" button return to TMerge.

By the way, in the "check for modifications", isn't the most logical
function of double-clicking a file with conflicts to resolve the
conflicts instead of just diff'ing?

Best wishes,
Jan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 3 16:22:48 2005