created a new branch v_1_1 and commited
dev2 updated v_1_1 and commit
updated by dev3 on v_1_1
dev2 push
Merge branch 'v_1_1' of https://github.com/chendongtom/gittest into v_1_1

Conflicts:
	test/src/test/Test.java
dev2 merged
Signed-off-by: tom <tom@gmail.com>
dev1 commit