Merge branch 'jc/apply-epoch-patch'
commit576210160297c15eff258de80ad085e55117104b
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 19:40:00 +0000 (5 12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 19:40:00 +0000 (5 12:40 -0700)
treef4786adf6b65e3ce9fa621695ddbffb4dbda9533
parent7e956ccc54830a049890dd72bd4a09d17135e894
parentc4593faf2df8f9c5e8ac409e40be991294a73e54
Merge branch 'jc/apply-epoch-patch'

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