Merge branch 'js/merge-edit-option'

* js/merge-edit-option: Documentation: fix formatting error in merge-options.txt
2011-12-05 11:15:52 -08:00 · 2011-12-05 11:15:52 -08:00 · eb3b8d7658
parent 406da78032 aad2a07cfc
commit eb3b8d7658
1 changed files with 0 additions and 1 deletions
--- 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.