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