TortoiseGitMerge show fake difference in the same lines if line end falls to 0x40000 byte
By aabro... on April 03, 2013 09:35 (imported from Google Code)
What steps will reproduce the problem?
- open in TortoiseGitMerge file1 and file2
- look at the 3197/3187 lines
What is the expected output? What do you see instead?
it's not expected difference in the 3197/3187 lines
but this lines selected as difference
What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGitMerge 22.214.171.124 - 64 Bit, Mar 26 2013
libsvn_diff 1.6.1, -dev
on the Windows 7 professional sp1 x64
Please provide any additional information below.
in the "file1" 3197th line end falls to 0x40000 offset