Merge branch 'jc/apply-epoch-patch' into jch
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:16 +0000 (23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:16 +0000 (23:11 -0700)
commit947428ca0448e0c793fd6a9c80ca7ab51ff5b0ed
tree5c6c0cd3e768e297e2bc55a53539f705df40c115
parent3483f469e3327f68145d571b1daf2061308c49f6
parentc4593faf2df8f9c5e8ac409e40be991294a73e54
Merge branch 'jc/apply-epoch-patch' into jch

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