Merge branch 'rr/complete-difftool' into next
commit2ee40cbcad58d6e95014e12371709c44c426fc83
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Jun 2013 21:16:30 +0000 (9 14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Jun 2013 21:16:30 +0000 (9 14:16 -0700)
treeb4034fd670b2c445092af1c97521d87e4abe09dc
parent90e5f58167ba5e5ee778e7351799f9fd886a491e
parentdff3446610792bd117682df201127b77ec8fbb37
Merge branch 'rr/complete-difftool' into next

* rr/complete-difftool:
  Revert 77c1305 and 3c3b46b
contrib/completion/git-completion.bash