first commit
Merge branch 'local-hedgehog'
added a line in git
add more text on 2nd line
first commit
Merge branch 'local-hedgehog'
Merge branch 'master' of github.com:dtenenbaum/test4
added another line in git
resolved diff