mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 22:06:20 +02:00
Code

Merge branch 'js/merge-edit-option' 

* js/merge-edit-option:
  Documentation: fix formatting error in merge-options.txt
This commit is contained in:
Junio C Hamano 2011-12-05 11:15:52 -08:00
parent 406da78032 aad2a07cfc
commit eb3b8d7658
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/merge-options.txt
View File

@ -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.