From 384770a5e79938b6a7633c5996597ef3211e4a7c Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Sat, 31 Jan 2009 00:19:29 +0100 Subject: contrib/difftool: add support for Kompare Signed-off-by: Markus Heidelberg Acked-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/difftool/git-difftool.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib/difftool/git-difftool.txt') diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt index ca3dbd2465..6e2610cda6 100644 --- a/contrib/difftool/git-difftool.txt +++ b/contrib/difftool/git-difftool.txt @@ -28,7 +28,8 @@ OPTIONS --tool=:: Use the merge resolution program specified by . 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 -- cgit v1.2.3