Log in / Register
MySQL patches by Codership
Overview
Code
Bugs
Blueprints
Translations
Answers
Bug #1387998
Comment #1
Comment 1 for bug 1387998
Revision history for this message
Seppo Jaakola (seppo-jaakola)
wrote
on 2014-10-31
:
#1
bzr merge -r mysql-5.5.40
lp:mysql-server/5.5
...
Text conflict in support-
files/mysql.
spec.sh
bzr merge -r mysql-5.5.40 lp:mysql-server/5.5 ... Text conflict in support-files/mysql.spec.sh
bzr merge -r mysql-5.5.40 lp:mysql-server/5.5 files/mysql. spec.sh
...
Text conflict in support-