Text conflict in VERSION Text conflict in sql/sql_class.cc Text conflict in storage/innobase/include/dict0mem.h 3 conflicts encountered.
Text conflict in VERSION innobase/ include/ dict0mem. h
Text conflict in sql/sql_class.cc
Text conflict in storage/
3 conflicts encountered.