From: Arjen Laarhoven <arjen@yaph.org>
Date: Thu, 3 May 2007 18:29:15 +0000 (+0200)
Subject: Document 'opendiff' value in config.txt and git-mergetool.txt
X-Git-Tag: v1.5.2-rc2~5^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e4e92b3f4bead3ee17164db35a44f8904eac9104;p=git.git

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 7e41ca6a0..a7daa0873 100644
--- 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",
-	"meld", "xxdiff", "emerge", "vimdiff"
+	"meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
 
 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 34288fe08..add01e855 100644
--- 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:
-	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