![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Apr 2011 23:20:11 +0000 (16:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Apr 2011 23:20:11 +0000 (16:20 -0700) | ||
| commit | b46c9fafcf5450196b003ba63d32bab6c479d23a | |
| tree | 6143994b332c0c5f933352a2734970e568dfcc59 | tree | snapshot |
| parent | 46a1f0728c6b5a886424e74c8bcacedf355eb918 | commit | diff |
| parent | 9d158601b3cb9753825e21441c88d31297b97be5 | commit | diff |
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
* jc/maint-apply-no-double-patch:
apply: do not patch lines that were already patched