mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Fix minor formatting issue in man page for git-mergetool
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
c0ce981f5e
commit
e15b484f6a
|
@ -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'
|
||||
|
|
Loading…
Reference in a new issue