From: Junio C Hamano Date: Fri, 1 Apr 2011 23:20:11 +0000 (-0700) Subject: Merge branch 'jc/maint-apply-no-double-patch' into maint X-Git-Tag: v1.7.4.3~10 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b46c9fafcf5450196b003ba63d32bab6c479d23a;p=git.git 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 --- b46c9fafcf5450196b003ba63d32bab6c479d23a