From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2011 19:15:52 +0000 (-0800)
Subject: Merge branch 'js/merge-edit-option'
X-Git-Tag: v1.7.8.1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb3b8d7658331f4ec5f115d7407393d845644f5e;p=git.git

Merge branch 'js/merge-edit-option'

* js/merge-edit-option:
  Documentation: fix formatting error in merge-options.txt
---

eb3b8d7658331f4ec5f115d7407393d845644f5e