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

Merge branch 'ss/mergetool--lib'

Browse Source 
* ss/mergetool--lib:
  mergetool--lib: Add Beyond Compare 3 as a tool
  mergetool--lib: Sort tools alphabetically for easier lookup
This commit is contained in:
Junio C Hamano
2011-03-19 23:24:27 -07:00
parent f4784b3eab ffe6dc081a
commit 9d59e6607a
5 changed files with 168 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1360,7 +1360,7 @@ _git_diff ()
}
__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
tkdiff vimdiff gvimdiff xxdiff araxis p4merge
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
"
_git_difftool ()