diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:40:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:40:50 -0800 |
| commit | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (patch) | |
| tree | 1dc29103a2e19a3ea95e5635af8468645913ccc9 /contrib/completion/git-completion.bash | |
| parent | Merge branch 'jk/maint-add-p-empty' (diff) | |
| parent | mergetool--lib: add p4merge as a pre-configured mergetool option (diff) | |
| download | git-9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e.tar.gz git-9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e.zip | |
Merge branch 'sc/difftool-p4merge'
* sc/difftool-p4merge:
mergetool--lib: add p4merge as a pre-configured mergetool option
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
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 () |