Merging issue in 2.15.0 only

What steps will reproduce the problem?

1. Start merge other branch to your brunch
2. Take file with conflict
3. Resolve conflict by taking other branch
4. File does not appear in "Commit" dialog
5. Commit

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

Expected:

File appears in "Commit" dialog (step 4)

File does not differ from other branch

Result:

File does not differ from your branch

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

TortoiseGit 2.15.0

Git 2.28.0.windows.1

Windows 10

Please provide any additional information below.

Works fine in

TortoiseGit 2.14.1

Git 2.28.0.windows.1

Windows 10