mergetools / gvimdiff2on commit Sync with v1.8.4.2 (cfd1056)
   1. "$MERGE_TOOLS_DIR/vimdiff"