test 123
test123456
test
Merge branch 'master' of https://github.com/milkmidi/git-p1
1
2
3
bran
master.txt
br
Merge branch 'branchTest1'

Conflicts:
	test.txt
123
Merge branch 'master' of https://github.com/milkmidi/git-p2