Merge branch 'js/merge-edit-option'

* js/merge-edit-option: Documentation: fix formatting error in merge-options.txt
git-mirror · Dec 5, 2011 · eb3b8d7 · eb3b8d7
2 parents 406da78 + aad2a07
commit eb3b8d7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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.