OSDN Git Service

Merge branch 'ew/apply'
authorJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)
* 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)


Trivial merge