commit r2
ok
commit r2 sencond
yes Merge branch 'r2'

Conflicts:
	readme.txt
commit r1 third
3 again 3 again 3 again Merge branch 'r1'

Conflicts:
	readme.txt