From e4e92b3f4bead3ee17164db35a44f8904eac9104 Mon Sep 17 00:00:00 2001 From: Arjen Laarhoven Date: Thu, 3 May 2007 20:29:15 +0200 Subject: Document 'opendiff' value in config.txt and git-mergetool.txt Signed-off-by: Arjen Laarhoven Signed-off-by: Junio C Hamano --- Documentation/git-mergetool.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-mergetool.txt') diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 34288fe08b..add01e855a 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=:: Use the merge resolution program specified by . 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 -- cgit v1.2.3