diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:03:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:03:15 -0700 |
| commit | fed276e7524d6a80ae5dec037d586bd28543fc79 (patch) | |
| tree | 979ede5142a918b8d0de5249789f697389e3d0b8 /Documentation/config.txt | |
| parent | 34c6dbdef439f7cd93d3fe22493a3c1496ce96f7 (diff) | |
| parent | 4c75136f7697f76b31641db775163f5c75906ee2 (diff) | |
| download | git-fed276e7524d6a80ae5dec037d586bd28543fc79.tar.gz git-fed276e7524d6a80ae5dec037d586bd28543fc79.tar.xz | |
Sync with GIT 1.5.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 015910f27..f59fbb302 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -579,7 +579,7 @@ merge.summary:: merge.tool:: Controls which merge resolution program is used by - gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", + gitlink:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". merge.verbosity:: |