Merge branch 'jc/apply-epoch-patch' into next
commitbf54a435420abc94bf7b4a60b58af947874f90b2
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2009 18:53:57 +0000 (13 11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2009 18:53:57 +0000 (13 11:53 -0700)
tree85d62a72981be328922802b180c06897ff71822f
parent062b684617112bfc5e00b1affdcb4d658a9a52d3
parentc4593faf2df8f9c5e8ac409e40be991294a73e54
Merge branch 'jc/apply-epoch-patch' into next

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