Re: bug with EOL

Stefan Küng schrieb:
> Stefan Wild wrote:
>> what I did: while conflict-merging a file I chose "use text block from theirs/mine"
>> what I wanted to happen: get the whole chosen lines into the merged file
>> what actually happened: I got the chosen lines but without EOL, all in one long line
>>
>> I thought that should be fixed in [r15192] (Set the EOL style of merged lines to EOL_AUTOLINE
>> to make sure they get saved in the files own EOL style) so I installed the latest nightly build,
>> but the bug still remains.
>> I use DOS/Windows-based EOLs (\x13\x10)
>
> Thanks for the report.
> Fixed in r15321, backported to 1.5.x in r15323.
>
> Stefan
>

yes, it works! :)
big thanks

-- 
Mit freundlichen Grüßen
Stefan Wild
autinity systems GmbH
Neefestraße 34-38
D-09119 Chemnitz
Amtsgericht Chemnitz HRB: 21552
Telefon: +49 (0) 371 35578-25
Fax:     +49 (0) 371 35578-13
email:   stefan.wild_at_autinity.de
web:     www.autinity.de
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1138098
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].