branch test
add test2.txt file
Merge branch 'dev'
modify test2.txt file
modify test2.txt second
modify test2.txt third
lalalalalala
merge branch dev with no-ff
sdfsfsdf
Merge branch 'dev'
fix bug 101
fix bug 101 and merge branch issue-101' issue-101
modify license test2.txt two files
merge the ved branch to master