summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorScott Chacon <schacon@gmail.com>2009-10-28 14:39:32 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-28 16:48:20 -0700
commitc8998b4823cbccd6bd49c2034e242ae7d5873eae (patch)
treea2e91d8202b7162c500ee1a3f9145040163a8506 /Documentation/git-difftool.txt
parentcd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (diff)
downloadgit-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.gz
mergetool--lib: add p4merge as a pre-configured mergetool option
Add p4merge to the set of built-in diff/merge tools, and update bash completion and documentation. Signed-off-by: Scott Chacon <schacon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 96a6c51a4b..8e9aed67d7 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
Use the diff tool specified by <tool>.
Valid merge tools are:
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
- ecmerge, diffuse, opendiff and araxis.
+ ecmerge, diffuse, opendiff, p4merge and araxis.
+
If a diff tool is not specified, 'git-difftool'
will use the configuration variable `diff.tool`. If the