Merge branch 'rr/doc-merge-strategies'

* rr/doc-merge-strategies: Documentation/merge-strategies: avoid hyphenated commands

Junio C Hamano committed Mar 25, 2014 at 11:08 UTC 3e33860aa1c39429ebfe2542adf9011bd2c9aeba

No changes.