]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'oc/mergetools-beyondcompare'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:08:03 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:08:04 +0000 (10:08 -0700)
* oc/mergetools-beyondcompare:
  mergetool: rename bc3 to bc

1  2 
contrib/completion/git-completion.bash