diff options
author | Scott Chacon <schacon@gmail.com> | 2009-10-28 14:39:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-28 16:48:20 -0700 |
commit | c8998b4823cbccd6bd49c2034e242ae7d5873eae (patch) | |
tree | a2e91d8202b7162c500ee1a3f9145040163a8506 /Documentation/git-mergetool.txt | |
parent | cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (diff) | |
download | git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.gz git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.xz |
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-mergetool.txt')
-rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 68ed6c095..4a6f7f3a2 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -27,7 +27,7 @@ OPTIONS Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, - diffuse, tortoisemerge, opendiff and araxis. + diffuse, tortoisemerge, opendiff, p4merge and araxis. + If a merge resolution program is not specified, 'git-mergetool' will use the configuration variable `merge.tool`. If the |