Re: Merge bug in 1.5.7

Thomas Börkel wrote:
> HI!
>
> When I have a block of lines with merge conflict and resolve the
> complete block using "theirs", then Tortoise kills the LFs in the
> resulting block.
>
> This happens only in 1.5.7. 1.5.6. is OK.

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

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1129680
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].