version 1
s Please enter the commit message for your changes. Lines starting
branch test
conflict branch
master branch
perfect
dev branch
 Please enter the commit message for your changes. Lines starting
merge with no ff
test finish