diff options
| author | Arjen Laarhoven <arjen@yaph.org> | 2007-05-03 18:29:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-04 05:56:23 (GMT) |
| commit | e4e92b3f4bead3ee17164db35a44f8904eac9104 (patch) | |
| tree | 3f36be1c3f970b01371829848ac22de735ee70dc | |
| parent | 5318f69812b3a06326524852d965e6a79fa52f85 (diff) | |
| download | git-e4e92b3f4bead3ee17164db35a44f8904eac9104.zip git-e4e92b3f4bead3ee17164db35a44f8904eac9104.tar.gz git-e4e92b3f4bead3ee17164db35a44f8904eac9104.tar.bz2 | |
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>
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7e41ca6..a7daa08 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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 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 |