diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-06 16:26:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-06 16:26:29 -0800 |
| commit | 92887a3ed176ab77bfc12e91914f1cdd99e591d6 (patch) | |
| tree | f13d04a119c7f4cfed4b934606db533c5ed04f0e /merge-options.txt | |
| parent | a4a3992fa056f81ff8e5aad3d059a43dd3c01521 (diff) | |
| download | git-htmldocs-92887a3ed176ab77bfc12e91914f1cdd99e591d6.tar.gz | |
Autogenerated HTML docs for v1.7.8-110-g4cb5d
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 6bd0b041c..1a5c12e31 100644 --- a/merge-options.txt +++ b/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. |