Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:44:23 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:44:23 +0000 (10:44 -0700)
commitef6b43a44b5e25afe6eee32fcfda7d2a738cec3c
treea45c82ee3b94312ae201959cf0ffa59c554f335b
parentbe0dca39e960d67511ca5a75887b903ccae7ccce
parent4c007ae8351a0a2beba57e2930ed21aed141e51e
Merge branch 'maint'

* maint:
  Remove duplicated "is a"
Documentation/diff-options.txt