Re: Cancelling merge from "Resolve Conflict" dialog

Alexander Klenin wrote:
> While trying to use and test new interactive conflict resolution
> I have frequently managed to get into
> "this is too broken to continue, better halt now" state.
> Perhaps for these cases it would be beneficial to add "abort merge"
> button to the dialog.
> Does it make sense?

Added an "Abort" button in revision 11930.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org