TortoiseGitMerge: "The text is identical ..." dialog causes display issues
What steps will reproduce the problem?
- Download the files
cr.txt(uses only CR as line ending) and
lf.txt(uses only LF as line ending)
- In Windows Explorer, select both files, then execute "TortoiseGit" > "Diff"
ℹNote: A dialog appears stating "The text is identical ..."
- 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
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?
git version 2.35.1.windows.2
TortoiseGitMerge 220.127.116.11 - 64 Bit, Jan 31 2022
libsvn_diff 1.8.0, -dev
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.