summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorLibravatar Jack Nagel <jacknagel@gmail.com>2011-12-05 01:53:27 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 11:15:45 -0800
commitaad2a07cfcdc89fd63bf28a2ac2873712fb25e43 (patch)
tree628d8f10097151101f6c35abce5791e241257043 /GIT-VERSION-GEN
parentTeach merge the '[-e|--edit]' option (diff)
downloadtgif-aad2a07cfcdc89fd63bf28a2ac2873712fb25e43.tar.xz
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>
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions