br2: 2=1
Merge branch 'br2'

Conflicts:
	test
br3:a=1
Merge branch 'br3'
Revert "Merge branch 'br3'"

This reverts commit 8df611130bc2b03f12c2c658fa24e7cd928e309b, reversing
changes made to 03d88a55f57047bf3ec2085c05d23805a87fda7e.
a=0
a=1