xx
change contents of test
:q!
:q::q!
update branch
add 1
master modification
merge conflict manually
modification at dev2 branch
Merge branch 'dev2'
xx
dddddd
fffff
Merge branch 'master' of https://github.com/cd-lewisl/learngit
skip to add into index
fdafsdfads