Re: bug in TortoiseGitMerge when file contains line feeds without carriage return

On 09.03.2013 13:17, Geert Mys wrote:
> 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).

But byte 0x406 is at line 45, not 59/60. And that change is indicated if
you activate "show whitespaces": then the EOLs are shown. On the left
side (login2-0000000.php) the EOL is only an LF, indicated by a vertical
arrow. On the right side the EOL is CRLF, indicated by a _| style arrow.
That's how it's supposed to work. If you want to see diffs in EOL as
well, either activate "show whitespaces" or you can even uncheck the
option "ignore line endings (recommended)" in the settings dialog.

However, the line you indicated in the screenshot (line 59/60), that's
also correct, well kind of.
But I can see why this is confusing, I'll try to change this.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3050680
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].