projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66f4b98) | patch
Documentation: fix formatting error in merge-options.txt
authorJack Nagel <jacknagel@gmail.com>
Mon, 5 Dec 2011 07:53:27 +0000 (01:53 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 19:15:45 +0000 (11:15 -0800)
commitaad2a07cfcdc89fd63bf28a2ac2873712fb25e43
tree628d8f10097151101f6c35abce5791e241257043tree | snapshot
parent66f4b98ad9a8218ad97b7b2f1604b205072dda62commit | diff
Documentation: fix formatting error in merge-options.txt

The first paragraph inside of a list item does not need a preceding line
consisting of a single '+', and in fact this causes the text to be
misrendered. Fix it.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-options.txt diff | blob | history
Git—the stupid content tracker