Merge branch 'sg/complete-symmetric-diff' into next
commitadb06181a56265eb06ef3932fdcdddfd39cfb086
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2011 23:31:06 +0000 (17 16:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2011 23:31:06 +0000 (17 16:31 -0700)
tree3085565cce749bdf300d02568c0c97f7da79b489
parent1d7e406d3cc2b9a91b8b82ecc539080acb30c982
parent1d66ec587e7d903afdf12a81718772a9eadc15a1
Merge branch 'sg/complete-symmetric-diff' into next

* sg/complete-symmetric-diff:
  bash: complete 'git diff ...branc<TAB>'
  bash: fix misindented esac statement in __git_complete_file()
contrib/completion/git-completion.bash