Code

Merge branch 'jc/maint-apply-no-double-patch' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:11 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:11 +0000 (16:20 -0700)
commitb46c9fafcf5450196b003ba63d32bab6c479d23a
tree6143994b332c0c5f933352a2734970e568dfcc59
parent46a1f0728c6b5a886424e74c8bcacedf355eb918
parent9d158601b3cb9753825e21441c88d31297b97be5
Merge branch 'jc/maint-apply-no-double-patch' into maint

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