test commit
이게뭐
git branch commit 1
modify
branch commit
Merge branch 'branch_git_and'
master 1
branch 2 commitbranch 2 commit
Merge branch 'branch_git_and'

Conflicts:
	test.txt
수정내용 : 새로운 test method 추가.
수정내용 : 마스터에도 main추가 수정 추가.
Merge branch 'branch_eclipse'

Conflicts:
	test/src/com/example/test/MainActivity.java
마스터 추가.
브랜치 수정
Merge branch 'branch_eclipse'

Conflicts:
	test/src/com/example/test/MainActivity.java
deal list add
deallist1.txt add
2 add
branch deallist modified
test master