diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-16 15:24:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-16 15:24:20 (GMT) |
| commit | 0987145dd3d11373270c1e0cfbd449f2c6c834c9 (patch) | |
| tree | d088652b6cce0bc844da014edf615a26847ecad3 /Documentation | |
| parent | c3117b21666f2a68aebd5fce0bcdc4ab705c299a (diff) | |
| parent | 79e0fe634865462551cf3fcad25c9a595652e925 (diff) | |
| download | git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.zip git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.tar.gz git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.tar.bz2 | |
Merge branch 'th/mergetools-deltawalker'
* th/mergetools-deltawalker:
Documentation/difftool: add deltawalker to list of valid diff tools
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 19d473c..fe38f66 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/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 |