mergetools / vimdiff3on commit Sync with maint (247b4d5)
   1. "$MERGE_TOOLS_DIR/vimdiff"