mergetools / vimdiff3on commit Sync with maint (39e07f7)
   1. "$MERGE_TOOLS_DIR/vimdiff"