test commit 2 branch
commit branch 3
commit for sub branch
Merge branch 'subbranch1' into branch1
edit subbranch2
edit subbranch3
Merge branch 'subbranch1' into branch1
add new file
Merge branch 'branch1'

Conflicts:
	1.cpp
itest