mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Arjen Laarhoven
2007-05-03 20:29:15 +02:00
committed by Junio C Hamano
parent 5318f69812
commit e4e92b3f4b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -490,7 +490,7 @@ merge.summary::
merge.tool:: merge.tool::
Controls which merge resolution program is used by Controls which merge resolution program is used by
gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
"meld", "xxdiff", "emerge", "vimdiff" "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
merge.verbosity:: merge.verbosity::
Controls the amount of output shown by the recursive merge Controls the amount of output shown by the recursive merge

2
Documentation/git-mergetool.txt
View File

@ -25,7 +25,7 @@ OPTIONS
-t or --tool=<tool>:: -t or --tool=<tool>::
Use the merge resolution program specified by <tool>. Use the merge resolution program specified by <tool>.
Valid merge tools are: 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' If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable merge.tool. If the will use the configuration variable merge.tool. If the