Re: TortoiseMerge.exe has encountered a problem ...

Bernd Kuhlmann wrote:
> Hi,
>
> to reproduce the problem with TortoiseSVN 1.4.99.10322 try the following
> steps:
> - Edit a conflict
> - In TortoiseMerge: Edit -> Use text block from "theirs"
>
> Now Windows shows:
> TortoiseMerge.exe hat ein Problem festgestellt und muss beendet werden.
>
> This does not happen, if you first click on the left or right pane or if you
> click on Navigate -> next conflict.

Fixed in revision 10331.

Stefan

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