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 /git-merge.html | |
| parent | a4a3992fa056f81ff8e5aad3d059a43dd3c01521 (diff) | |
| download | git-htmldocs-92887a3ed176ab77bfc12e91914f1cdd99e591d6.tar.gz | |
Autogenerated HTML docs for v1.7.8-110-g4cb5d
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/git-merge.html b/git-merge.html index 8a191e341..215a1e4b6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -656,11 +656,10 @@ inspect and further tweak the merge result before committing.</p></div> -e
</dt>
<dd>
-<div class="literalblock">
-<div class="content">
-<pre><tt>Invoke editor before committing successful merge to further
-edit the default merge message.</tt></pre>
-</div></div>
+<p>
+ Invoke editor before committing successful merge to further
+ edit the default merge message.
+</p>
</dd>
<dt class="hdlist1">
--ff
|