From: Theodore Ts'o Date: Tue, 27 Mar 2007 15:38:59 +0000 (-0400) Subject: Fix minor formatting issue in man page for git-mergetool X-Git-Tag: v1.5.1~19^2~10 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e15b484f6af581270f2ee03149e4e0d6af053ddf;p=git.git Fix minor formatting issue in man page for git-mergetool Signed-off-by: "Theodore Ts'o" --- diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 5baaaca0b..34288fe08 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -26,11 +26,11 @@ OPTIONS Use the merge resolution program specified by . 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 ------