diff options
| author |  Markus Heidelberg <markus.heidelberg@web.de> | 2009-01-31 00:19:29 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:34:58 -0800 |
| commit | 384770a5e79938b6a7633c5996597ef3211e4a7c (patch) | |
| tree | 627d959ba2b63a86f26560e1c693c2782ff35d76 /contrib/difftool/git-difftool.txt | |
| parent | t3412: clean up GIT_EDITOR usage (diff) | |
| download | tgif-384770a5e79938b6a7633c5996597ef3211e4a7c.tar.xz | |
contrib/difftool: add support for Kompare
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/difftool/git-difftool.txt')
| -rw-r--r-- | contrib/difftool/git-difftool.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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=<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 |