From: Junio C Hamano <junkio@cox.net>
Date: Tue, 25 Jul 2006 19:50:23 +0000 (-0700)
Subject: Merge branch 'ew/apply'
X-Git-Tag: v1.4.2-rc2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8861ea81be90594d9f23d30792d6cf8d22ad1ff;p=git.git

Merge branch 'ew/apply'

* ew/apply:
  Fix t4114 on cygwin
  apply: handle type-changing patch correctly.
  apply: split out removal and creation into different phases.
  apply: check D/F conflicts more carefully.
  typechange tests for git apply (currently failing)
---

a8861ea81be90594d9f23d30792d6cf8d22ad1ff