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 /contrib/completion | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-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 'contrib/completion')
| -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 e3ddecc995..2a9a88968f 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 () |