Merge branch 'jc/apply-epoch-patch' into maint
commit6b37b3d873e734919dfd43c3d124c4f98e265296
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2009 19:05:57 +0000 (26 12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2009 19:05:57 +0000 (26 12:05 -0700)
tree08048af506668bb94b1589e893f212eb7cd65e72
parent6dfa21309f4b1eeede72a942df1155327717fb87
parentc4593faf2df8f9c5e8ac409e40be991294a73e54
Merge branch 'jc/apply-epoch-patch' into maint

* jc/apply-epoch-patch:
  apply: notice creation/removal patches produced by GNU diff