Merge branch 'maint'

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 5baaaca0b5433ae279b3961d72d0cffa8ca046e3..34288fe08b3962554178fd8a6baa8f7030096baf 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -26,11 +26,11 @@ OPTIONS
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
        kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
-
-       If a merge resolution program is not specified, 'git mergetool'
-       will use the configuration variable merge.tool.  If the
-       configuration variable merge.tool is not set, 'git mergetool'
-       will pick a suitable default.
++
+If a merge resolution program is not specified, 'git mergetool'
+will use the configuration variable merge.tool.  If the
+configuration variable merge.tool is not set, 'git mergetool'
+will pick a suitable default.
 
 Author
 ------