![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 22:28:14 +0000 (14:28 -0800) | ||
| committer | Junio 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
Documentation/merge-options.txt: group "ff" related options together
Trivial merge