Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / Documentation / git-mergetool.txt

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 5baaaca0b5433ae279b3961d72d0cffa8ca046e3..add01e855a09c34b6aa9c83af6efcd17f24f3c9d 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -25,12 +25,12 @@ OPTIONS
 -t or --tool=<tool>::
        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.
+       kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
++
+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
 ------