已修改        test1.txt
Merge branch 'master' of github.com:cjld/testgitgui

Conflicts:
	test1.txt