![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800) |
* js/merge-edit-option:
Documentation: fix formatting error in merge-options.txt
Documentation: fix formatting error in merge-options.txt
Trivial merge