summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorScott Chacon <schacon@gmail.com>2009-10-28 21:39:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-28 23:48:20 (GMT)
commitc8998b4823cbccd6bd49c2034e242ae7d5873eae (patch)
treea2e91d8202b7162c500ee1a3f9145040163a8506 /Documentation/merge-config.txt
parentcd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (diff)
downloadgit-c8998b4823cbccd6bd49c2034e242ae7d5873eae.zip
git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.gz
git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.bz2
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/merge-config.txt')
-rw-r--r--Documentation/merge-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index c0f96e7..a403155 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -23,7 +23,7 @@ merge.tool::
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
- "diffuse", "ecmerge", "tortoisemerge", "araxis", and
+ "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
"opendiff". Any other value is treated is custom merge tool
and there must be a corresponding mergetool.<tool>.cmd option.