DiffMerge is not named DiffMerge.exe

[jvhaarst]

I just installed gitextensions, and when I wanted to use DiffMerge as merge tool, I couldn't, as it only allows me to select DiffMerge.exe, but in my recent installation, it is now installed as C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe

[KindDragon]

ATM you can select path to DiffMerge manually

[KindDragon]

@KindDragon

gitextensions/GitUI/CommandsDialogs/SettingsDialog/MergeToolsHelper.cs

Lines 282 to 284 in cb5f00c

	case "diffmerge":
	exeName = "DiffMerge.exe";
	return FindFileInFolders(exeName, @"SourceGear\DiffMerge\");