add f1
merge and unhandle conflict
modify f1 in new2
modify f1 in new2 branch
add f2 in new2 branch
merge with --no-ff from branch new2
merge from new for diff_use
add f3 from another user
add f4
Merge branch 'master' of github.com:renyi-github/test
modify f4 from origin master
add f4 from new master
merge new test dir and origin
modify f4 with new line in origin dir
modify f4 with haha
solve conflict as original dir
commit all
del test_clone
haha
OK