Code

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)
* maint:
  Remove duplicated "is a"

1  2 
Documentation/diff-options.txt

Simple merge