print br1
print br2
Merge branch 'br1' into br2

Conflicts:
	src/main/java/com/zhxy/controller/IndexAction.java
print br
Revert "Merge branch 'br1' into br2"

This reverts commit 2c6d59bafa5ac1ea8ffaf7e08f5eb2138bfe16bd, reversing
changes made to 992d00a6f0ec3ecec4661d3ddc14a82a26ce5fcf.

Conflicts:
	src/main/java/com/zhxy/controller/IndexAction.java
revert revert operation
print rebase1
print rebase2
print merge1
print merge2
Merge branch 'br1' into br2

Conflicts:
	src/main/java/com/zhxy/controller/IndexAction.java
fetch 1