mergetools / gvimdiff3on commit Sync with 2.3.5 (cf8a8c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"