Comment 1 for bug 1387998

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

bzr merge -r mysql-5.5.40 lp:mysql-server/5.5
...
Text conflict in support-files/mysql.spec.sh