spdr870/gitextensions — pull request #761 by jalinvaux (2011-12-20 15:18:49+00:00)
Title: Fixed issue : [Open In customized merge tool] would cause error message for Diff-Script invoking

For portable edition/reinstall situation, performing conflict resolving by clicking on [Open In customized merge tool] would cause error message for Diff-Script invoking when the executable file differs to that stored in registry. Therefore, fix it by getting parent folder of executable file instead of by InstallDir entry in registry.