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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c257cdf525e2daa3b90140430327e6f5d2ea6bda..24f9655fef8b9acbeb239554d55585480a0eede7 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -520,7 +520,7 @@ merge.summary::
 merge.tool::
        Controls which merge resolution program is used by
        gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
-       "meld", "xxdiff", "emerge", "vimdiff"
+       "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
 
 merge.verbosity::
        Controls the amount of output shown by the recursive merge