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

bug in TortoiseGitMerge when file contains line feeds without carriage return

From: Geert Mys <geert.tortoisegit.tigris_at_myrosoft.com>
Date: Sat, 9 Mar 2013 04:17:36 -0800 (PST)

Environment: Windows 7 64bit
TortoiseGit 1.8.1.0
Open TortoiseGitMerge with the 2 php-files attached.
At byte 0x406 a 0x0A character is found not preceded by 0x0D in login2-0000.php.
GitMerge fails to show the lines at the same as indicated in the jpg file send (see red line).

zip-file contains 2 php files which have to be compared and jpg file showing how the comparison is being shown.

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

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

Received on 2013-03-09 13:22:46 CET

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.