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

Merge branch 'sc/difftool-p4merge'

Browse Source 
* sc/difftool-p4merge:
  mergetool--lib: add p4merge as a pre-configured mergetool option
This commit is contained in:
Junio C Hamano
2009-11-15 16:40:50 -08:00
parent 3176bd0b0d c8998b4823
commit 9fa51ff940
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 ()