title: Git on Windows: How do you set up a mergetool?
body: <p>I've tried msysGit and Git on Cygwin. Both work just fine in and of themselves and both run gitk and git-gui perfectly.</p>
  
  <p>Now how the heck do I configure a mergetool? (Vimdiff works on Cygwin, but preferably I would like something a little more user-friendly for some of our  Windows-loving coworkers.)</p>