mergetools / vimdiff3on commit The tenth batch for 2.15 (20fed7c)
   1. "$MERGE_TOOLS_DIR/vimdiff"