diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-16 11:50:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-16 11:50:43 -0700 |
| commit | 892d90ec9b6d7c228e63b6eead67b76a5730f621 (patch) | |
| tree | a8a617a40584c6e72a87c5f26f7a4e747d819d04 /git-difftool.txt | |
| parent | e768cc13cb7472ba915c92243f3bd5fdbb9fe66f (diff) | |
| download | git-htmldocs-892d90ec9b6d7c228e63b6eead67b76a5730f621.tar.gz | |
Autogenerated HTML docs for v1.7.10-rc1-22-gf5241
Diffstat (limited to 'git-difftool.txt')
| -rw-r--r-- | git-difftool.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 19d473c07..fe38f667f 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -32,8 +32,9 @@ OPTIONS --tool=<tool>:: Use the diff tool specified by <tool>. Valid diff tools are: - araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3, - kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. + araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff, + kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and + xxdiff. + If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the |