MergeDlg: Commit dialog is opened instead of resovle dialog after resolve button pressed

What steps will reproduce the problem?

1. Start merge branches with conflicts.
2. In the "Git Command Progress" window click resolve.

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

Expected: Resolve dialog is opened. Instead: Commit dialog is opened.

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

TortoiseGit 2.4.0.2. Windows 10.

Please provide any additional information below.