mergetools / vimdiff2on commit Sync with maint (89ea799)
   1. "$MERGE_TOOLS_DIR/vimdiff"