rename 4 branch2
Merge branch 'test_branche2'
rename test3->test5 use commond "mv"
modify hello5 3->5
rename6 3->6
Merge branch 'test_branche3'

Conflicts:
	hello5.txt
new test
testne
rename
Merge branch 'test_ne'
test4
modify a
conflickok
ok