From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Apr 2014 20:39:03 +0000 (-0700)
Subject: Merge branch 'rr/doc-merge-strategies' into maint
X-Git-Tag: v1.9.2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38245956648c54d138efc7b95b450dc7203e2a2f;p=thirdparty%2Fgit.git

Merge branch 'rr/doc-merge-strategies' into maint

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

38245956648c54d138efc7b95b450dc7203e2a2f