TortoiseMerge "use this text block" can strip line endings

What I did:
I was looking at the changes I'd made to a UTF-8 file using TortoiseMerge.

I wanted to undo some of those changes but not all of them.

I right-clicked on several lines of the original text on the left hand side, and selected "use this text block".

As expected, the text was replaced on the right hand side. And it all looked fine.

But I saved the changes and opened the file in my usual editor (Notepad2), I noticed that the line endings had been stripped from the lines I'd selected in TortoiseMerge and now all my text was on one line.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-26 12:15:32 CET