Notepad++_5.5_惯用法教程
快捷命令
Merge branch 'master' of https://github.com/SueGary/Graduation-Design

Conflicts:
	README.md
git 的资料
git-简易指南