Merge branch 'rr/complete-difftool' into next
commit90e5f58167ba5e5ee778e7351799f9fd886a491e
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Jun 2013 19:59:04 +0000 (7 12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jun 2013 19:59:04 +0000 (7 12:59 -0700)
tree87b4f542e29e171b23f0182633fce0545d21abd2
parentb16ca1f551123ed0e442daadb8cf1b90ad9dc3c3
parent3c3b46bab11eab8fc2b7305e2c051269fce5a925
Merge branch 'rr/complete-difftool' into next

* rr/complete-difftool:
  completion: add deprecated __git_complete_file ()
contrib/completion/git-completion.bash