summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-15 16:40:50 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-15 16:40:50 -0800
commit9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (patch)
tree1dc29103a2e19a3ea95e5635af8468645913ccc9 /contrib
parent3176bd0b0da232207df99802bd714f51bc10f153 (diff)
parentc8998b4823cbccd6bd49c2034e242ae7d5873eae (diff)
downloadgit-9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e.tar.gz
Merge branch 'sc/difftool-p4merge'
* sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a0917d1809..bd66639d48 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -953,7 +953,7 @@ _git_diff ()
}
__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis
+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge
"
_git_difftool ()