update test.txt on dev branch
update test.txt on dev2 branch
update test.txt on master
update test.txt on master
update test.txt on dev2
Merge branch 'dev2'
update test.txt on dev3
merge with no-ff