Document 'opendiff' value in config.txt and git-mergetool.txt

Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7e41ca6a0d3e4329d1efc10b4dcb90613975e5bd..a7daa08731715846d68b35c4e9da740e878ed05a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -490,7 +490,7 @@ merge.summary::
 merge.tool::
        Controls which merge resolution program is used by
        gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
 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
 
 merge.verbosity::
        Controls the amount of output shown by the recursive merge

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 34288fe08b3962554178fd8a6baa8f7030096baf..add01e855a09c34b6aa9c83af6efcd17f24f3c9d 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -25,7 +25,7 @@ OPTIONS
 -t or --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
 -t or --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:

-       kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
+       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
 +
 If a merge resolution program is not specified, 'git mergetool'
 will use the configuration variable merge.tool.  If the