![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700) | ||
| commit | a8861ea81be90594d9f23d30792d6cf8d22ad1ff | |
| tree | aaef855759df564257826f4969da06e84a93dbdb | tree | snapshot |
| parent | 325ba14e400d7f0df876a2ddc8e2c85d563313bd | commit | diff |
| parent | 56ac168f6f89bebf2846c4bafed01318fe3f25cd | commit | diff |
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)
* 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)