Well setting up the diff tool was a bitch. msysgit/git doesn't like spaces no matter what is escaped. So I had to add the diff exe to PATH and invoke it from a shell script, which itself is invoked by git. Good thing I don't have to phone Linus home to invoke shell.exe to invoke git to invoke a shell script to invoke diff.