I have winmerge installed, but it's not detected as a merge tool. Would you consider including support for it out of the box?