mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool--lib: add p4merge as a pre-configured mergetool option

Browse Source 
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>
This commit is contained in:
Scott Chacon
2009-10-28 14:39:32 -07:00
committed by Junio C Hamano
parent cd0f8e6d63
commit c8998b4823
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View File

@ -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 ()