Arjen LaarhovenSigned-off-by: Arjen Laarhoven <arjen@yaph.org> --- Documentation/config.txt | 2 +- Documentation/git-mergetool.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −2
Documentation/config.txt, Documentation/git-mergetool.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt index c257cdf..24f9655 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -520,7 +520,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 34288fe..add01e8 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
-- 1.5.2.rc1.3.g7a150