mergetools / vimdiff2on commit Merge branch 'lf/bundle-with-tip-wo-message' into maint (2903c28)
   1. "$MERGE_TOOLS_DIR/vimdiff"