first1
aaaaa
aaaaa
Update abc.txt
ccc
aaaaa
Merge branch 'master' of https://github.com/bluemirr5/gitTest.git

Conflicts:
	abc.txt
Update abc.txt
aaaa
Merge branch 'master' of https://github.com/bluemirr5/gitTest.git

Conflicts:
	abc.txt
aaa
Merge branch 'shbranch'
dddd
Update e.txt
Update e.txt
STS로 커밋2