When I attempt to use the external merge tool or external diff tool, it will not open. I have to navigate through explorer and use Tortoise GIT just to use Win Merge on my files due to conflicts. This is in version 1.6.14.0 on Windows 7. The external merge pops up the window like it used to when the merge tool was open, but it is only up for about a second and closes. On the external diff it just doesn't do anything at all.
