[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

newline symbol is always the same (TortoiseMerge)

From: ZTHawk <zhawk83_at_googlemail.com>
Date: Mon, 9 Sep 2013 11:50:40 -0700 (PDT)

All newline symbols are always the same in TortoiseMerge.
The use the symbol for 0x0A.
If I add default windows newline (0x0D 0x0A) and make a diff with unix style newline (0x0A) TortoiseMerge will show that there is a difference but they will both have the same symbol.

I am using tortoiseSVN 1.8.2 x64 with Win7 x64

I posted an issue here:
http://code.google.com/p/tortoisesvn/issues/detail?id=554

I have attached a diff of schiller's text.
additionally I have added a tortoisemerge for a versioned file. I changed a line and added a new line (the hex content of those lines show the kind of newline)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

t-merge_0d_0a.png t-merge_schiller.png
Received on 2013-09-09 20:53:56 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.