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
  • #542
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Difference between line endings in compared files (external Diff Viewer)

By yado... on September 08, 2010 05:23 (imported from Google Code)


What steps will reproduce the problem?

  1. Choose TortoiseGit->Settings->External Programs->Diff Viewer. Setup WinMerge as external diff viewer.
  2. Commit a file.
  3. Change a file.
  4. Choose TortoiseGit->Check for modification. Select Compare with base.
    The CRLF settings are:
    - Checked AutoCRLF

What is the expected output? What do you see instead?
TortoiseGit should convert back that line ending according to the TortoiseGit setting.

What version of the product are you using? On what operating system?
TortoiseGit 1.5.3.0. Windows 7 (x64).

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