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>
Arjen Laarhoven committed
May 3, 2007 at 20:29 UTC
e4e92b3f4bead3ee17164db35a44f8904eac9104
2 files changed
+2
-2
Documentation/config.txt
+1
-1
@@ -490,7 +490,7 @@ merge.summary::
490
merge.tool::
491
Controls which merge resolution program is used by
492
gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
493
- "meld", "xxdiff", "emerge", "vimdiff"
493
+ "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
494
495
merge.verbosity::
496
Controls the amount of output shown by the recursive merge
Documentation/git-mergetool.txt
+1
-1
@@ -25,7 +25,7 @@ OPTIONS
25
-t or --tool=<tool>::
26
Use the merge resolution program specified by <tool>.
27
Valid merge tools are:
28
- kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
28
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
29
+
30
If a merge resolution program is not specified, 'git mergetool'
31
will use the configuration variable merge.tool. If the