summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJack Nagel <jacknagel@gmail.com>2011-12-05 07:53:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-05 19:15:45 (GMT)
commitaad2a07cfcdc89fd63bf28a2ac2873712fb25e43 (patch)
tree628d8f10097151101f6c35abce5791e241257043 /Documentation/merge-options.txt
parent66f4b98ad9a8218ad97b7b2f1604b205072dda62 (diff)
downloadgit-aad2a07cfcdc89fd63bf28a2ac2873712fb25e43.zip
git-aad2a07cfcdc89fd63bf28a2ac2873712fb25e43.tar.gz
git-aad2a07cfcdc89fd63bf28a2ac2873712fb25e43.tar.bz2
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 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6bd0b04..1a5c12e 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.
--edit::
-e::
-+
Invoke editor before committing successful merge to further
edit the default merge message.