Haya_branch mode
	modified:   git.txt
	modified:   git.txt
	modified:   git.txt
	modified:   git.txt
Merge branch 'master' of https://github.com/7799/git_manual into Haya_branch

Conflicts:
	git.txt

	modified:   git.txt
	Haya_btanch/
	master/
	modified:   git.txt
	Haya_btanch/
	master/
new file:   Haya_btanch/README.md
new file:   Haya_btanch/git.txt
new file:   master/README.md
new file:   master/git.txt