Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #1728
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

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?

  1. open in TortoiseGitMerge file1 and file2
  2. 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 1.8.2.0 - 64 Bit, Mar 26 2013
libsvn_diff 1.6.1, -dev
apr 1.4.6
apr-utils 1.3.12
on the Windows 7 professional sp1 x64

Please provide any additional information below.

in the "file1" 3197th line end falls to 0x40000 offset


Desktop.zip

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking