Related Feature request: (this maybe should be a separate post, but I add it here as it is closely related)
Add an option in the dialog to manually select the file in which the merge should be executed, if this file could not be found due to tree conflicts: None of these 2 options is satisfying, as the changes that are to be merged are lost. Please add [Manually select target file for merge] -- 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/022d4e53-5419-4276-a3d2-d0d9927f5a3d%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
