Andrew's git / gitweb.git / diff
?
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

Documentation/merge-options.txt patch | blob | history
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6bd0b041c3c1c0af5d03fce43d8016706e9256b1..1a5c12e3171ab82f489bcd53657c8a89741a3dab 100644 (file)
--- 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.