mergetools / gvimdiff2on commit Sync with 1.8.4.5 (be38bee)
   1. "$MERGE_TOOLS_DIR/vimdiff"