mirror of
https://github.com/git/git.git
synced 2024-11-19 09:13:55 +01:00
Fix typo in config.txt
There was an 'l' (ell) instead of a '1' (one) in one of the gitlinks. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9e1a2acfb2
commit
6ea9c7eb27
@ -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::
|
||||
|
Loading…
Reference in New Issue
Block a user