init
commit test
after checkout a preivous version
m
check in
merge, conflicts solved
new branch2 commits
merge