mergetools / gvimdiff2on commit tests: explicitly use `git.exe` on Windows (8abfdf4)
   1. "$MERGE_TOOLS_DIR/vimdiff"