modified:   yourfile.txt
Merge branch 'master' of github.com:agreatfool/dummy