mergetools / gvimdiff2on commit Sync with 2.3.8 (c99fec6)
   1. "$MERGE_TOOLS_DIR/vimdiff"