undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor formatting issue in man page for git-mergetool

Browse Source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2007-03-27 11:38:59 -04:00
parent c0ce981f5e
commit e15b484f6a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-mergetool.txt
View File

@ -26,11 +26,11 @@ OPTIONS
Use the merge resolution program specified by <tool>. Use the merge resolution program specified by <tool>.
Valid merge tools are: Valid merge tools are:
kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
+
If a merge resolution program is not specified, 'git mergetool' If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable merge.tool. If the will use the configuration variable merge.tool. If the
configuration variable merge.tool is not set, 'git mergetool' configuration variable merge.tool is not set, 'git mergetool'
will pick a suitable default. will pick a suitable default.
Author Author
------ ------