Fix minor formatting issue in man page for git-mergetool

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
maint
Theodore Ts'o 2007-03-27 11:38:59 -04:00
parent c0ce981f5e
commit e15b484f6a
1 changed files with 5 additions and 5 deletions

View File

@ -26,7 +26,7 @@ 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'