mergetools / vimdiff2on commit Merge branch 'sp/cygwin-build-fixes' (60dae46)
   1. "$MERGE_TOOLS_DIR/vimdiff"