added geo1.txt
stuff
added geo2.txt
Merge branch 'geo' of https://github.com/maxwellv/git-branching into geo
stuff
put content in geo3.txt
Merge branch 'geo' of https://github.com/maxwellv/git-branching into geo
fixed geo2.txt