mergetools / gvimdiff3on commit Sync with 2.8.4 (c42b5d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"