Merge branch 'rr/doc-merge-strategies' into maint
* rr/doc-merge-strategies: Documentation/merge-strategies: avoid hyphenated commands
Junio C Hamano committed
Apr 3, 2014 at 13:39 UTC
38245956648c54d138efc7b95b450dc7203e2a2f
No changes.