diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 11:15:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 11:15:52 -0800 |
| commit | eb3b8d7658331f4ec5f115d7407393d845644f5e (patch) | |
| tree | 2ff9a37138583242a41fc213d7e6f47789dc7610 | |
| parent | 406da7803217998ff6bf5dc69c55b1613556c2f4 (diff) | |
| parent | aad2a07cfcdc89fd63bf28a2ac2873712fb25e43 (diff) | |
| download | git-eb3b8d7658331f4ec5f115d7407393d845644f5e.tar.gz | |
Merge branch 'js/merge-edit-option'
* js/merge-edit-option:
Documentation: fix formatting error in merge-options.txt
| -rw-r--r-- | Documentation/merge-options.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 6bd0b041c3..1a5c12e317 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. |