试试换行
Merge branch 'master' of github.com:dupang/manual56

Conflicts:
	docs/Chapter_04/4.1.0_Overview_of_MySQL_Programs.md