Merge branch 'jc/maint-apply-no-double-patch'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:00 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:00 +0000 (14:22 -0700)
* jc/maint-apply-no-double-patch:
apply: do not patch lines that were already patched

Trivial merge