git log 的更多说明
Merge branch 'master' of github.com:dorisy/learning

Conflicts:
	git_log.txt