Merge branch 'rr/complete-difftool-fixup' into next
commitfe91170e02125f373ff0f57e68a2fd9aaee5ce9c
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 21:08:37 +0000 (11 14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 21:08:37 +0000 (11 14:08 -0700)
tree973e3790721e0d9be5879506972bf39c3f919437
parent04f08325541a67059ad00ee931eccbd44a109fff
parent5269f7f8c6b293f1568c4f03c14596835e22df31
Merge branch 'rr/complete-difftool-fixup' into next

* rr/complete-difftool-fixup:
  completion: show can take both revlist and paths
contrib/completion/git-completion.bash