t7
no message
t8
d
0
Merge branch 'master' into branch1

Conflicts:
	test1.txt
abc
Merge remote-tracking branch 'remotes/origin/branch2' into branch1

Conflicts:
	test1.txt