add merge
merge with no-ff
Test branch
Merge branch 'dev'

this is a test
Test 1.
merge with no-ff Test 1
t1:Test branch
t2:Branch Test
li t2:test