mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
5318f69812
commit
e4e92b3f4b
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue