mergetools / vimdiff2on commit Merge branch 'rs/t4062-obsd' into maint (b3a19e0)
   1. "$MERGE_TOOLS_DIR/vimdiff"