create readme.txt on branch feature1
add readme.txt on master
after merge
add diff content
Merge branch 'master' of github.com:LanceLance/mygitrepo