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

Merge branch 'oc/mergetools-beyondcompare'

Browse Source 
* oc/mergetools-beyondcompare:
  mergetool: rename bc3 to bc
This commit is contained in:
Junio C Hamano
2014-10-29 10:08:03 -07:00
parent d70e331c0e f13f9b0eab
commit c1777a2970
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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