Can you please send a git-mergetool patch to the git mailing list? This will save everyone the trouble of needing to discover how to configure it. Feel free to contact me offline if you need some pointers.