tree 926a5f279c1ab6036e440dd9813f3544aba2ec67
parent 0e20414f106e22fb13aa4d00201dbeb7422b83fb
parent 690b29758289ac81062159c178b6d917f06e9862
author Junio C Hamano <gitster@pobox.com> 1330986494 -0800
committer Junio C Hamano <gitster@pobox.com> 1330986494 -0800

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

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