Andrew's git / gitweb.git / diff
?
Merge branch 'jc/doc-merge-options' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 22:28:14 +0000 (14:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 22:28:14 +0000 (14:28 -0800)
* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together

Trivial merge