into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/t/disabled.def: Manual merge from 5.0.
Attach a file by drag & drop or click to upload
