branch test
another branch test
create one new branch

:
and simple
& simple
conflict fixed
submit test.txt
merge with no-ff
modify 1.txt
commit 1.txt
test
delete 1.txt
add dev.txt
modify test.txt in branch feature1
modify test.txt in branch master
commit test.txt
add merge
merge with no-ff
modify test.txt
modify bug in test.txt