22

Happiness is :

$ git pull
Auto-merging foo.bar
Merge made by the 'recursive' strategy.
$ _

Comments
Add Comment