pause on merge conflict - is it a setting?

When merging, the dialog used to pause and let me resolve conflicts as they
were encountered. With latest version, it continues merging, only allowing
me to resolve conflicts at the end of the merge. If there are many
conflicts over multiple revisions, it eventually aborts and says I need to
resolve the conflicts and re-merge. How can I get the old behavior back, it
is my strong preference.

Thanks,

Mike

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3195797

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-02 18:04:58 CET