diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-25 12:50:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-25 12:50:23 -0700 |
| commit | a8861ea81be90594d9f23d30792d6cf8d22ad1ff (patch) | |
| tree | aaef855759df564257826f4969da06e84a93dbdb /builtin-rm.c | |
| parent | Merge branch 'jc/read-tree' (diff) | |
| parent | Fix t4114 on cygwin (diff) | |
| download | tgif-a8861ea81be90594d9f23d30792d6cf8d22ad1ff.tar.xz | |
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)
Diffstat (limited to 'builtin-rm.c')
0 files changed, 0 insertions, 0 deletions