change master
I change the readme.txt in the branch feature
produce chongtu
conflict resolve
I have changed readme.txt of the dev
merge with no-ff
Test
Merge branch 'dev'
change :delete a
merge issue-101
Test git stash