diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-04 06:26:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-04 06:26:54 (GMT) |
| commit | 9aae177a4adff326421e55c7c0f3138de15ce2c1 (patch) | |
| tree | ca19b08ff373ea122f87c90d03d111b03a89921e /Documentation/config.txt | |
| parent | 50acc58914bf02217e55fdd739a844f2bfc45410 (diff) | |
| parent | e3ad95a8be82663d27cb501eaf9bad86a30f9cda (diff) | |
| download | git-9aae177a4adff326421e55c7c0f3138de15ce2c1.zip git-9aae177a4adff326421e55c7c0f3138de15ce2c1.tar.gz git-9aae177a4adff326421e55c7c0f3138de15ce2c1.tar.bz2 | |
Merge branch 'maint'
* maint:
gitweb: use decode_utf8 directly
posix compatibility for t4200
Document 'opendiff' value in config.txt and git-mergetool.txt
Allow PERL_PATH="/usr/bin/env perl"
Make xstrndup common
diff.c: fix "size cache" handling.
http-fetch: Disable use of curl multi support for libcurl < 7.16.
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 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 |