From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Mar 2012 22:28:14 +0000 (-0800)
Subject: Merge branch 'jc/doc-merge-options' into maint
X-Git-Tag: v1.7.9.3~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb8cbe7861546a0646d38d7cd49dc245001ec5c5;p=git.git

Merge branch 'jc/doc-merge-options' into maint

* jc/doc-merge-options:
  Documentation/merge-options.txt: group "ff" related options together
---

bb8cbe7861546a0646d38d7cd49dc245001ec5c5