mergetools / vimdiff2on commit Merge branch 'rs/http-push-cleanup' into maint (310b945)
   1. "$MERGE_TOOLS_DIR/vimdiff"