b1 edited hello.cc
b2 edited hello.cc
Merge branch 'b2'

Conflicts:
	hello.cc