Merge branch 'jc/maint-apply-no-double-patch'
commitaf2b1848ccf43d5df9f47e0a4fab1ac6f58be78e
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:00 +0000 (15 14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:00 +0000 (15 14:22 -0700)
tree8aa16847dfd5b0d45e84f09a8d97e5c8ff594ffb
parent848e219fe696b45d36353d12cdb47870cae2559e
parent9d158601b3cb9753825e21441c88d31297b97be5
Merge branch 'jc/maint-apply-no-double-patch'

* jc/maint-apply-no-double-patch:
  apply: do not patch lines that were already patched