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 380
    • Issues 380
    • 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
  • #3911
Closed
Open
Issue created Apr 13, 2022 by Marcono1234@Marcono1234

TortoiseGitMerge: "The text is identical ..." dialog causes display issues

What steps will reproduce the problem?

  1. Download the files cr.txt (uses only CR as line ending) and lf.txt (uses only LF as line ending)
  2. In Windows Explorer, select both files, then execute "TortoiseGit" > "Diff"
    ℹ Note: A dialog appears stating "The text is identical ..."
  3. Click "Ok" on the dialog
    ❌ Many of the buttons of the TortoiseGitMerge window do not render correctly (see screenshot below), until you manually resize the window or hover over the buttons

TortoiseGitMerge window not rending correctly

What is the expected output? What do you see instead?

Actual: The window does not render correctly.

What version of TortoiseGit and Git are you using? On what operating system?

TortoiseGit 2.13.0.1
git version 2.35.1.windows.2

TortoiseGitMerge 2.13.0.0 - 64 Bit, Jan 31 2022
libsvn_diff 1.8.0, -dev
apr 1.6.5
apr-util 1.6.1

Microsoft Windows [Version 10.0.19043.1586]

Please provide any additional information below.

While the "The text is identical..." dialog is still open, the window rendering in the background is even more broken until you click the "Ok" button of the dialog. This also affects TortoiseGitMerge when viewing changes during commits.

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