Fixed issue #2809: TortoiseGitMerge: Block Control Button is always disabled on confl...