Skip to content

TortoiseGitMerge might hang with ignore comments enabled

UiDiffHangs.zip*

By right clicking on the TeklifPageNav.cs and selecting
Git->Git check for modifications and then double clicking on the TeklifPageNav.cs
results in an unending hang .

The hang only occurs in TortoiseGitMerge , however TortoiseGitUiff works just fine.

Version information:

TortoiseGit 2.2.0.0 (C:\Program Files\TortoiseGit\bin) git version 2.9.3.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\Program Files\Git\mingw64\etc\gitconfig; C:\ProgramData\Git\config)

Operating System information: Windows 10 64bit

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