From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:08:23 +0000 (-0700)
Subject: Merge branch 'rr/doc-merge-strategies'
X-Git-Tag: v2.0.0-rc0~63
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=3e33860aa1c39429ebfe2542adf9011bd2c9aeba;p=git.git

Merge branch 'rr/doc-merge-strategies'

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

3e33860aa1c39429ebfe2542adf9011bd2c9aeba