X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcompletion%2Fgit-completion.bash;h=bd66639d481db97511ef6fe3abf1b0a5d3da6ea3;hb=9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e;hp=a0917d18095f63abd1935be33e8fbcdfb6b2b6fa;hpb=3176bd0b0da232207df99802bd714f51bc10f153;p=git.git

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a0917d180..bd66639d4 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 ()