diff options
| author | Arjen Laarhoven <arjen@yaph.org> | 2007-05-03 20:29:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-03 22:56:23 -0700 |
| commit | e4e92b3f4bead3ee17164db35a44f8904eac9104 (patch) | |
| tree | 3f36be1c3f970b01371829848ac22de735ee70dc /Documentation/config.txt | |
| parent | 5318f69812b3a06326524852d965e6a79fa52f85 (diff) | |
| download | git-e4e92b3f4bead3ee17164db35a44f8904eac9104.tar.gz | |
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>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7e41ca6a0d..a7daa08731 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 |