Code

Merge branch 'js/merge-edit-option'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800)
committerJunio 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


Trivial merge