X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fdifftool%2Fgit-difftool.txt;h=6e2610cda6d2721eb4fb9ac063bb47ef80bfbae3;hb=fa5bc8abb35e34f673c41cb5c66d0a2f21536861;hp=ca3dbd2465f9c33f450f9d7bfb9d60206ef509ae;hpb=f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d;p=git.git

diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt
index ca3dbd246..6e2610cda 100644
--- a/contrib/difftool/git-difftool.txt
+++ b/contrib/difftool/git-difftool.txt
@@ -28,7 +28,8 @@ OPTIONS
 --tool=<tool>::
 	Use the merge resolution program specified by <tool>.
 	Valid merge tools are:
-	kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
+	kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
+	vimdiff, gvimdiff, ecmerge, and opendiff
 +
 If a merge resolution program is not specified, 'git-difftool'
 will use the configuration variable `merge.tool`.  If the