mergetools / gvimdiff2on commit Merge branch 'js/mingw-parameter-less-c-functions' (fd4df42)
   1. "$MERGE_TOOLS_DIR/vimdiff"